Skip to content

Commit 1d0bc58

Browse files
author
Gary Brown
committed
Removed generic types for parser and model - made them protocol specific. Also tested out the distribution.
1 parent 667d362 commit 1d0bc58

File tree

38 files changed

+218
-305
lines changed

38 files changed

+218
-305
lines changed

‎distribution/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@
5555
<artifactId>org.scribble.protocol.parser</artifactId>
5656
<version>${scribble.version}</version>
5757
</dependency>
58+
<dependency>
59+
<groupId>org.scribble.modules</groupId>
60+
<artifactId>org.scribble.protocol.conformance</artifactId>
61+
<version>${scribble.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.scribble.modules</groupId>
65+
<artifactId>org.scribble.protocol.validation.connectedness</artifactId>
66+
<version>${scribble.version}</version>
67+
</dependency>
5868
</dependencies>
5969

6070
<build>

‎integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/actions/ValidateAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.eclipse.ui.IWorkbenchPart;
2727
import org.scribble.designer.DesignerServices;
2828
import org.scribble.designer.logger.EclipseScribbleLogger;
29-
import org.scribble.protocol.model.Model;
29+
import org.scribble.protocol.model.ProtocolModel;
3030
import org.scribble.protocol.model.Protocol;
3131

3232
public class ValidateAction implements IObjectActionDelegate {
@@ -52,7 +52,7 @@ public void run(IAction action) {
5252

5353
java.io.InputStream is=((IFile)res).getContents();
5454

55-
Model<Protocol> model=
55+
ProtocolModel model=
5656
DesignerServices.getProtocolParser().parse(is,
5757
logger);
5858

‎integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/editor/ScribbleContentOutlinePage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public void update() {
263263
}
264264
}
265265

266-
private org.scribble.protocol.model.Model m_model=null;
266+
private org.scribble.protocol.model.ProtocolModel m_model=null;
267267
private org.scribble.protocol.model.ModelReference m_reference=null;
268268
private org.scribble.designer.editor.outliner.ModelOutliner m_outliner=null;
269269
}

‎modules/org.scribble.command/src/main/java/org/scribble/command/conforms/ConformsCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ public boolean execute(String args[]) {
6161
try {
6262
java.io.InputStream is=new java.io.FileInputStream(f1);
6363

64-
org.scribble.protocol.model.Model<Protocol> p1=
64+
org.scribble.protocol.model.ProtocolModel p1=
6565
m_protocolParser.parse(is, m_logger);
6666

6767
is.close();
6868

6969
is=new java.io.FileInputStream(f2);
7070

71-
org.scribble.protocol.model.Model<Protocol> p2=
71+
org.scribble.protocol.model.ProtocolModel p2=
7272
m_protocolParser.parse(is, m_logger);
7373

7474
is.close();

‎modules/org.scribble.command/src/main/java/org/scribble/command/validate/ValidateCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public boolean execute(String args[]) {
6161
try {
6262
java.io.InputStream is=new java.io.FileInputStream(f);
6363

64-
org.scribble.protocol.model.Model<Protocol> model=
64+
org.scribble.protocol.model.ProtocolModel model=
6565
m_protocolParser.parse(is, m_logger);
6666

6767
if (model != null) {

‎modules/org.scribble.common/META-INF/MANIFEST.MF

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.scribble.common
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: org.scribble.common.osgi.Activator
77
Bundle-Vendor: www.scribble.org
8-
Import-Package: org.osgi.framework,
9-
org.osgi.util.tracker
8+
Import-Package: org.osgi.framework
109
Export-Package: org.scribble.common.logger,
1110
org.scribble.common.util

‎modules/org.scribble.common/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
<artifactId>org.osgi.core</artifactId>
2020
<version>${osgi.version}</version>
2121
</dependency>
22-
<dependency>
23-
<groupId>org.apache.felix</groupId>
24-
<artifactId>org.apache.felix.framework</artifactId>
25-
</dependency>
2622
<dependency>
2723
<groupId>junit</groupId>
2824
<artifactId>junit</artifactId>

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/BehaviourListComparatorRule.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
9494
if (isConditionalDecisionMaker(mainPoint) == false) {
9595
String mesg=org.scribble.common.util.MessageUtil.format(
9696
java.util.PropertyResourceBundle.getBundle(
97-
"org.scribble.conformance.Messages").
97+
"org.scribble.protocol.conformance.Messages").
9898
getString("_UNEXPECTED_BEHAVIOUR"), null);
9999

100100
//ModelIssue issue=new ModelIssue(mainPoint, mesg);
@@ -133,7 +133,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
133133

134134
String mesg=org.scribble.common.util.MessageUtil.format(
135135
java.util.PropertyResourceBundle.getBundle(
136-
"org.scribble.conformance.Messages").
136+
"org.scribble.protocol.conformance.Messages").
137137
getString("_EXPECTING_ACTIVITY"), null);
138138

139139
/*
@@ -580,7 +580,7 @@ protected boolean compareMultiplePaths(ComparatorContext context,
580580
// role
581581

582582
String mesg=java.util.PropertyResourceBundle.getBundle(
583-
"org.scribble.conformance.Messages").
583+
"org.scribble.protocol.conformance.Messages").
584584
getString("_ADDITIONAL_UNMATCHED_REF_PATHS");
585585

586586
/*
@@ -619,7 +619,7 @@ protected boolean compareMultiplePaths(ComparatorContext context,
619619
src.getBehaviourList().size() > 0) {
620620

621621
String mesg=java.util.PropertyResourceBundle.getBundle(
622-
"org.scribble.conformance.Messages").
622+
"org.scribble.protocol.conformance.Messages").
623623
getString("_ADDITIONAL_UNMATCHED_PATHS");
624624

625625
/*

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/ChannelComparatorRule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
7676
if (ret == false) {
7777
String mesg=org.scribble.common.util.MessageUtil.format(
7878
java.util.PropertyResourceBundle.getBundle(
79-
"org.scribble.conformance.Messages").
79+
"org.scribble.protocol.conformance.Messages").
8080
getString("_CHANNEL_MISMATCH"),
8181
new String[]{mainName, refName});
8282

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/Conformer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public interface Conformer {
2828
* @param ref The reference model
2929
* @param logger The logger
3030
*/
31-
public void conforms(org.scribble.protocol.model.Model<?> model,
32-
org.scribble.protocol.model.Model<?> ref,
31+
public void conforms(org.scribble.protocol.model.ProtocolModel model,
32+
org.scribble.protocol.model.ProtocolModel ref,
3333
ScribbleLogger logger);
3434

3535
}

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/DefaultComparatorContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public boolean compare(ModelObject main, ModelObject reference,
157157
// can be navigated
158158
String mesg=org.scribble.common.util.MessageUtil.format(
159159
java.util.PropertyResourceBundle.getBundle(
160-
"org.scribble.conformance.Messages").
160+
"org.scribble.protocol.conformance.Messages").
161161
getString("_UNEXPECTED_BEHAVIOUR"), null);
162162

163163
/*

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/InteractionComparatorRule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
151151
if (f_directionMismatch) {
152152
String mesg=org.scribble.util.MessageUtil.format(
153153
java.util.PropertyResourceBundle.getBundle(
154-
"org.scribble.conformance.Messagess").
154+
"org.scribble.protocol.conformance.Messagess").
155155
getString("_INTERACTION_DIRECTION_MISMATCH"),
156156
new String[]{});
157157

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/MessageSignatureComparatorRule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
8989
} else {
9090
String mesg=org.scribble.common.util.MessageUtil.format(
9191
java.util.PropertyResourceBundle.getBundle(
92-
"org.scribble.conformance.Messages").
92+
"org.scribble.protocol.conformance.Messages").
9393
getString("_MSIG_MISMATCH"),
9494
new String[]{r.toString()});
9595

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/ModelConformer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package org.scribble.protocol.conformance;
1818

1919
import org.scribble.common.logger.ScribbleLogger;
20-
import org.scribble.protocol.model.Model;
20+
import org.scribble.protocol.model.ProtocolModel;
2121

2222
public class ModelConformer implements Conformer {
2323

24-
public void conforms(Model<?> model, Model<?> ref, ScribbleLogger logger) {
24+
public void conforms(ProtocolModel model, ProtocolModel ref, ScribbleLogger logger) {
2525

2626
BehaviourList mainBehaviourList=BehaviourList.createBehaviourList(model.getDefinition().getBlock());
2727
BehaviourList refBehaviourList=BehaviourList.createBehaviourList(ref.getDefinition().getBlock());

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/ParticipantComparatorRule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
7676
if (ret == false) {
7777
String mesg=org.scribble.common.util.MessageUtil.format(
7878
java.util.PropertyResourceBundle.getBundle(
79-
"org.scribble.conformance.Messages").
79+
"org.scribble.protocol.conformance.Messages").
8080
getString("_ROLE_MISMATCH"),
8181
new String[]{mainName, refName});
8282

‎modules/org.scribble.protocol.conformance/src/main/java/org/scribble/protocol/conformance/TypeReferenceComparatorRule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public boolean compare(ComparatorContext context, ModelObject main,
7171
if ((ret = mtr.equals(rtr)) == false) {
7272
String mesg=org.scribble.common.util.MessageUtil.format(
7373
java.util.PropertyResourceBundle.getBundle(
74-
"org.scribble.conformance.Messages").
74+
"org.scribble.protocol.conformance.Messages").
7575
getString("_TYPE_MISMATCH"),
7676
new String[]{rtr.getName()});
7777

‎modules/org.scribble.protocol.conformance/src/main/resources/org/scribble/conformance/Messages.properties ‎modules/org.scribble.protocol.conformance/src/main/resources/org/scribble/protocol/conformance/Messages.properties

File renamed without changes.

‎modules/org.scribble.protocol.parser/src/main/java/org/scribble/protocol/parser/antlr/ANTLRProtocolParser.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@
2424
import org.scribble.protocol.parser.ProtocolParser;
2525
import org.scribble.common.logger.ScribbleLogger;
2626

27+
/**
28+
* This class provides the ANTLR implementation of the Protocol Parser
29+
* interface.
30+
*
31+
*/
2732
public class ANTLRProtocolParser implements ProtocolParser {
2833

29-
public Model<Protocol> parse(InputStream is, ScribbleLogger logger) {
30-
Model<Protocol> ret=null;
34+
public ProtocolModel parse(InputStream is, ScribbleLogger logger) {
35+
ProtocolModel ret=null;
3136

3237
try {
3338
ScribbleProtocolLexer lex = new ScribbleProtocolLexer(new ANTLRInputStream(is));

‎modules/org.scribble.protocol.parser/src/main/java/org/scribble/protocol/parser/antlr/ProtocolTreeAdaptor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ProtocolTreeAdaptor implements org.antlr.runtime.tree.TreeAdaptor {
3939
private ScribbleProtocolParser m_parser=null;
4040
private Token m_currentToken=null;
4141

42-
private Model<Protocol> m_model=null;
42+
private ProtocolModel m_model=null;
4343

4444
private static final Logger _log=Logger.getLogger(ProtocolTreeAdaptor.class.getName());
4545

@@ -81,7 +81,7 @@ public class ProtocolTreeAdaptor implements org.antlr.runtime.tree.TreeAdaptor {
8181
m_listClass.put("types", TypeReference.class);
8282
}
8383

84-
public Model<Protocol> getProtocolModel() {
84+
public ProtocolModel getProtocolModel() {
8585
return(m_model);
8686
}
8787

@@ -387,7 +387,7 @@ public Object nil() {
387387
Object ret=null;
388388

389389
if (m_model == null) {
390-
m_model = new Model<Protocol>();
390+
m_model = new ProtocolModel();
391391
ret = m_model;
392392
} else {
393393
ret = new java.util.Vector<Object>();

‎modules/org.scribble.protocol.validation.connectedness/src/main/java/org/scribble/protocol/validation/connectedness/ConnectednessValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package org.scribble.protocol.validation.connectedness;
1818

1919
import org.scribble.common.logger.ScribbleLogger;
20-
import org.scribble.protocol.model.Model;
20+
import org.scribble.protocol.model.ProtocolModel;
2121
import org.scribble.protocol.validation.Validator;
2222

2323
public class ConnectednessValidator implements Validator {
2424

25-
public void validate(Model<?> model, ScribbleLogger logger) {
25+
public void validate(ProtocolModel model, ScribbleLogger logger) {
2626
ConnectednessVisitor visitor=new ConnectednessVisitor(logger);
2727

2828
model.visit(visitor);

‎modules/org.scribble.protocol.validation.connectedness/src/test/java/org/scribble/protocol/validation/connectedness/ConnectednessValidatorTest.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
*/
1717
package org.scribble.protocol.validation.connectedness;
1818

19-
import static org.junit.Assert.*;
19+
//import static org.junit.Assert.*;
2020

2121
import org.scribble.protocol.model.Interaction;
22-
import org.scribble.protocol.model.Model;
22+
import org.scribble.protocol.model.Protocol;
23+
import org.scribble.protocol.model.ProtocolModel;
2324
import org.scribble.protocol.model.Participant;
2425
import org.scribble.protocol.validation.connectedness.ConnectednessValidator;
2526

@@ -28,9 +29,9 @@ public class ConnectednessValidatorTest {
2829
@org.junit.Test
2930
public void testInteractionReqResp() {
3031

31-
Model<TestDefinition> model=new Model<TestDefinition>();
32+
ProtocolModel model=new ProtocolModel();
3233

33-
TestDefinition defn=new TestDefinition();
34+
Protocol defn=new Protocol();
3435
model.setDefinition(defn);
3536

3637
Interaction interaction1=new Interaction();
@@ -62,9 +63,9 @@ public void testInteractionReqResp() {
6263

6364
@org.junit.Test
6465
public void testInteractionsDisconnected() {
65-
Model<TestDefinition> model=new Model<TestDefinition>();
66+
ProtocolModel model=new ProtocolModel();
6667

67-
TestDefinition defn=new TestDefinition();
68+
Protocol defn=new Protocol();
6869
model.setDefinition(defn);
6970

7071
Interaction interaction1=new Interaction();

‎modules/org.scribble.protocol.validation.connectedness/src/test/java/org/scribble/protocol/validation/connectedness/TestDefinition.java

-25
This file was deleted.

‎modules/org.scribble.protocol/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.scribble.protocol
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Activator: org.scribble.protocol.osgi.Activator
77
Bundle-Vendor: www.scribble.org
8-
Import-Package: org.osgi.framework;version="1.3.0"
8+
Import-Package: org.osgi.framework,
9+
org.osgi.util.tracker
910
Require-Bundle: org.scribble.common
1011
Export-Package: org.scribble.protocol.model,
1112
org.scribble.protocol.parser,

‎modules/org.scribble.protocol/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<artifactId>org.scribble.common</artifactId>
2020
<version>${scribble.version}</version>
2121
</dependency>
22+
<dependency>
23+
<groupId>org.apache.felix</groupId>
24+
<artifactId>org.apache.felix.framework</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>org.apache.felix</groupId>
2428
<artifactId>org.osgi.core</artifactId>

‎modules/org.scribble.protocol/src/main/java/org/scribble/protocol/model/Definition.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ public void setBlock(Block block) {
140140
* @return The model, or null if not contained within
141141
* a model
142142
*/
143-
public Model<?> getModel() {
144-
Model<?> ret=null;
143+
public ProtocolModel getModel() {
144+
ProtocolModel ret=null;
145145
ModelObject cur=this;
146146

147147
while (ret == null && cur != null) {
148-
if (cur instanceof Model<?>) {
149-
ret = (Model<?>)cur;
148+
if (cur instanceof ProtocolModel) {
149+
ret = (ProtocolModel)cur;
150150
} else {
151151
cur = cur.getParent();
152152
}

0 commit comments

Comments
 (0)