Changeset 38 for trunk

Timestamp:

05/08/11 20:21:05 (14 years ago)

Author:

phdmakk

Message:

+ implemented a fix for the interface module containment check change request

Location:

trunk/t3q/src/org/etsi/t3q/visitor

Files:

• ModuleContentsChecker.java (modified) (1 diff)
• QualityChecker.java (modified) (1 diff)

trunk/t3q/src/org/etsi/t3q/visitor/ModuleContentsChecker.java

@@ -83 +83 @@
         private void addInterfaceModulePermissibleTypes() {
                 ArrayList<Integer> permissibleTypesList = new ArrayList<Integer>();
-                permissibleTypesList.add(TTCN3ParserTokenTypes.ComponentDef);
-                permissibleTypesList.add(TTCN3ParserTokenTypes.PortDef);
+                //permissibleTypesList.add(TTCN3ParserTokenTypes.ComponentDef);
+                //permissibleTypesList.add(TTCN3ParserTokenTypes.PortDef);
+                //TODO: the above can then be considered redundant..
+                permissibleTypesList.add(TTCN3ParserTokenTypes.TypeDef);
                 addPermissibleListForModuleID(InterfaceModuleIDSubstring,
                                 permissibleTypesList);

trunk/t3q/src/org/etsi/t3q/visitor/QualityChecker.java

@@ -1158 +1158 @@
                                 } else {
                                         if (!moduleRestriction.equals("TypesAndValues")
+                                                        && !moduleRestriction.equals("Interface")
                                                         && (definitionTypeNode.getType() == TTCN3ParserTokenTypes.TypeDef)
                                                         && (definitionTypeNode.getFirstChild().getType() == TTCN3ParserTokenTypes.StructuredTypeDef)) {