Minor fixes and cleanup

Author: cogu

autosar/__init__.py

@@ -10,7 +10,7 @@
 import autosar.builder
 import autosar.port
 from abc import (ABC,abstractmethod)
-from autosar.base import splitRef
+import autosar.base
 import autosar.bsw.com
 import autosar.bsw.os
 import autosar.util
@@ -25,7 +25,7 @@ def workspace(version=3.0, patch = 2, schema=None, attributes=None, useDefaultWr
    return autosar.Workspace(version, patch, schema, attributes, useDefaultWriters)
 
 
-   
+
 
 def splitRef(ref):
    return autosar.base.splitRef(ref)
@@ -37,27 +37,29 @@ def ApplicationError(name, errorCode, parent=None, adminData=None):
    return autosar.portinterface.ApplicationError(name, errorCode, parent, adminData)
 
 def ModeGroup(name, typeRef, parent=None, adminData=None):
-   return autosar.portinterface.ModeGroup(name, typeRef, parent, adminData)
-
-def CompuMethodConst(name, elements, parent=None, adminData=None):
-   return autosar.datatype.CompuMethodConst(name, elements, parent, adminData)
+   return autosar.mode.ModeGroup(name, typeRef, parent, adminData)
 
 def ParameterDataPrototype(name, typeRef, swAddressMethodRef=None, swCalibrationAccess=None, initValue = None, parent=None, adminData=None):
    return autosar.element.ParameterDataPrototype(name, typeRef, swAddressMethodRef, swCalibrationAccess, initValue, parent, adminData)
 
 
 #template support
 class Template(ABC):
-   
+
    usageCount = 0 #number of times this template have been applied
-   
+   static_ref = ''
+
+   @classmethod
+   def ref(cls, ws):
+      return cls.static_ref
+
    @classmethod
    def get(cls, ws):
       ref = cls.ref(ws)
       if ws.find(ref) is None:
          ws.apply(cls)
       return ws.find(ref)
-   
+
    @classmethod
    @abstractmethod
    def apply(cls, ws, **kwargs):

autosar/package.py

@@ -208,7 +208,7 @@ def createModeSwitchInterface(self, name, modeGroup = None, isService=False, adm
                 assert (ws is not None)
                 modeDeclarationGroup = ws.find(modeGroup.typeRef, role='ModeDclrGroup')
                 if modeDeclarationGroup is None:
-                    raise ValueError('invalid type reference: '+dataElements.typeRef)
+                    raise ValueError('invalid type reference: '+modeGroup.typeRef)
                 modeGroup.typeRef=modeDeclarationGroup.ref #normalize reference string
                 portInterface.modeGroup = modeGroup
                 modeGroup.parent = portInterface

autosar/util/dcf.py

@@ -293,7 +293,7 @@ def save_dcf(self, dest_dir, dcf_name, xml_file_map, schema = None, force = True
                 elem = xml_file_map[key]
                 extension = '' if key.lower().endswith('.arxml') else '.arxml'
                 file_name = key + extension
-                lines.extend(self.indent(self._single_file_ref(file_name, elem['root']),1))
+                lines.extend(self.indent(self._single_file_ref(file_name),1))
             lines.append('</DCF>')
             with open(dest_file, 'w') as fp:
                 fp.write('\n'.join(lines))
@@ -306,13 +306,13 @@ def _component_file_ref(self, component_name):
         lines.append('</FILEREF>')
         return lines
 
-    def _single_file_ref(self, file_name, root_item, directory=None):
+    def _single_file_ref(self, file_name, directory=None):
         if directory is not None:
             file_path = os.path.join(directory, file_name)
         else:
             file_path = file_name
         lines = ['<FILEREF>']
-        lines.append(self.indent('<ARXML ROOTITEM="{}" TYPE="">{}</ARXML>'.format(root_item.upper(), file_path),1))
+        lines.append(self.indent('<ARXML>{}</ARXML>'.format(file_path),1))
         lines.append('</FILEREF>')
         return lines
 

autosar/workspace.py

@@ -339,6 +339,7 @@ def append(self,elem):
         if isinstance(elem,autosar.package.Package):
             self.packages.append(elem)
             elem.parent=self
+            self.map['packages'][elem.name] = elem
         else:
             raise ValueError(type(elem))