Fixed JavaIterator.next() and JavaList.get() type wrap.

Author: ylussaud

plugins/Python4Capella/java_api/Java_API.py

@@ -42,8 +42,11 @@ def next(self) -> T:
             nxt = iteratorNext(self.get_java_object())
             specific_cls = self.e_object_class.get_class(nxt)
             if specific_cls is not None:
-                if hasattr(self.cls, 'e_class') and hasattr(specific_cls, 'e_class') and specific_cls.e_class.isSuperTypeOf(self.cls.e_class) and not specific_cls.e_class.equals(self.cls.e_class):
-                    return self.cls(nxt)
+                if hasattr(self.cls, 'e_class') and hasattr(specific_cls, 'e_class') and specific_cls.e_class.isSuperTypeOf(self.cls.e_class):
+                    try:
+                        return self.cls(nxt)
+                    except:
+                        return specific_cls(nxt)
                 else:
                     return specific_cls(nxt)
             else:
@@ -105,7 +108,10 @@ def get(self, index: int) -> T:
             specific_cls = self.e_object_class.get_class(value)
             if specific_cls is not None:
                 if hasattr(self.cls, 'e_class') and hasattr(specific_cls, 'e_class') and specific_cls.e_class.isSuperTypeOf(self.cls.e_class):
-                    return self.cls(value)
+                    try:
+                        return self.cls(value)
+                    except:
+                        return specific_cls(value)
                 else:
                     return specific_cls(value)
             else:

tests/Python4CapellaTests/capella_manual_tests.py

@@ -724,3 +724,14 @@ def test_OperationalActivity_incoming_getter(self):
         self.assertEqual(Interaction, type(oa.get_incoming()[0]))
         for elem in oa.get_incoming():
             self.assertEqual(Interaction, type(elem))
+
+    def test_LogicalComponentPkg_owned_logical_components(self):
+        """
+        This test need the IFE project to be in the workspace to run
+        """
+        model = CapellaModel()
+        model.open("/In-Flight Entertainment System/In-Flight Entertainment System.aird")
+        se = model.get_system_engineering()
+        for lc in se.get_logical_architecture().get_logical_component_pkg().get_owned_logical_components():
+            #: :type lc: LogicalComponent
+            lc.get_name()