Merge branch 'release/3.3.3'

build.gradle

@@ -131,7 +131,7 @@ dependencies {
     // Other dependencies we're unable to resolve via standard repositories
 
     if (buildAccess == 'internal') {
-        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.3.2', ext: 'zip'
+        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.3.3', ext: 'zip'
     }
     else {
         preCompile group: 'com.nomagic', name: 'magicdraw', version: '185sp3', classifier: 'MagicDraw_185_sp3_no_install', ext: 'zip'

gradle.properties

@@ -1,4 +1,4 @@
-version=3.3.2
+version=3.3.3
 group=org.openmbee.magicdraw.mdk
 descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
 magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk

src/main/java/gov/nasa/jpl/mbee/mdk/MMSSyncPlugin.java

@@ -6,8 +6,8 @@
 import com.nomagic.magicdraw.plugins.Plugin;
 import gov.nasa.jpl.mbee.mdk.mms.sync.coordinated.CoordinatedSyncProjectEventListenerAdapter;
 import gov.nasa.jpl.mbee.mdk.mms.sync.delta.DeltaSyncProjectEventListenerAdapter;
-import gov.nasa.jpl.mbee.mdk.mms.sync.jms.JMSSyncProjectEventListenerAdapter;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncProjectEventListenerAdapter;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter;
+import gov.nasa.jpl.mbee.mdk.mms.sync.mms.MMSDeltaProjectEventListenerAdapter;
 import gov.nasa.jpl.mbee.mdk.mms.sync.status.SyncStatusProjectEventListenerAdapter;
 import gov.nasa.jpl.mbee.mdk.util.TaskRunner;
 
@@ -18,8 +18,8 @@
  */
 public class MMSSyncPlugin extends Plugin {
     private static MMSSyncPlugin instance;
-    private LocalSyncProjectEventListenerAdapter localSyncProjectEventListenerAdapter;
-    private JMSSyncProjectEventListenerAdapter jmsSyncProjectEventListenerAdapter;
+    private LocalDeltaProjectEventListenerAdapter localDeltaProjectEventListenerAdapter;
+    private MMSDeltaProjectEventListenerAdapter mmsDeltaProjectEventListenerAdapter;
     private DeltaSyncProjectEventListenerAdapter deltaSyncProjectEventListenerAdapter;
     private CoordinatedSyncProjectEventListenerAdapter coordinatedSyncProjectEventListenerAdapter;
     private SyncStatusProjectEventListenerAdapter syncStatusProjectEventListenerAdapter;
@@ -31,12 +31,12 @@ public static MMSSyncPlugin getInstance() {
         return instance;
     }
 
-    public LocalSyncProjectEventListenerAdapter getLocalSyncProjectEventListenerAdapter() {
-        return localSyncProjectEventListenerAdapter;
+    public LocalDeltaProjectEventListenerAdapter getLocalDeltaProjectEventListenerAdapter() {
+        return localDeltaProjectEventListenerAdapter;
     }
 
-    public JMSSyncProjectEventListenerAdapter getJmsSyncProjectEventListenerAdapter() {
-        return jmsSyncProjectEventListenerAdapter;
+    public MMSDeltaProjectEventListenerAdapter getMmsDeltaProjectEventListenerAdapter() {
+        return mmsDeltaProjectEventListenerAdapter;
     }
 
     public DeltaSyncProjectEventListenerAdapter getDeltaSyncProjectEventListenerAdapter() {
@@ -57,8 +57,8 @@ public void init() {
         Application.getInstance().getProjectsManager().addProjectListener(coordinatedSyncProjectEventListenerAdapter = new CoordinatedSyncProjectEventListenerAdapter());
         Application.getInstance().getProjectsManager().addProjectListener(deltaSyncProjectEventListenerAdapter = new DeltaSyncProjectEventListenerAdapter());
         // Common and MMS clear their respective inMemoryChangelogs on save, so it needs to go after coordinated and delta which use it.
-        Application.getInstance().getProjectsManager().addProjectListener(localSyncProjectEventListenerAdapter = new LocalSyncProjectEventListenerAdapter());
-        Application.getInstance().getProjectsManager().addProjectListener(jmsSyncProjectEventListenerAdapter = new JMSSyncProjectEventListenerAdapter());
+        Application.getInstance().getProjectsManager().addProjectListener(localDeltaProjectEventListenerAdapter = new LocalDeltaProjectEventListenerAdapter());
+        Application.getInstance().getProjectsManager().addProjectListener(mmsDeltaProjectEventListenerAdapter = new MMSDeltaProjectEventListenerAdapter());
         Application.getInstance().getProjectsManager().addProjectListener(syncStatusProjectEventListenerAdapter = new SyncStatusProjectEventListenerAdapter());
 
         Application.getInstance().addSaveParticipant(coordinatedSyncProjectEventListenerAdapter);

src/main/java/gov/nasa/jpl/mbee/mdk/actions/ClassToComponentRefactorWithIDAction.java

@@ -10,8 +10,8 @@
 import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element;
 import com.nomagic.uml2.ext.magicdraw.components.mdbasiccomponents.Component;
 import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncProjectEventListenerAdapter;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncTransactionCommitListener;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener;
 import gov.nasa.jpl.mbee.mdk.util.Utils;
 
 import java.awt.event.ActionEvent;
@@ -35,7 +35,7 @@ public void actionPerformed(ActionEvent e) {
         if (con == null || !con) {
             return;
         }
-        LocalSyncTransactionCommitListener listener = LocalSyncProjectEventListenerAdapter.getProjectMapping(Application.getInstance().getProject()).getLocalSyncTransactionCommitListener();
+        LocalDeltaTransactionCommitListener listener = LocalDeltaProjectEventListenerAdapter.getProjectMapping(Application.getInstance().getProject()).getLocalDeltaTransactionCommitListener();
         if (listener != null) {
             listener.setDisabled(true);
         }

src/main/java/gov/nasa/jpl/mbee/mdk/actions/ComponentToClassRefactorWithIDAction.java

@@ -9,8 +9,8 @@
 import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Element;
 import com.nomagic.uml2.ext.magicdraw.components.mdbasiccomponents.Component;
 import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncProjectEventListenerAdapter;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncTransactionCommitListener;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener;
 import gov.nasa.jpl.mbee.mdk.util.Utils;
 
 import java.awt.event.ActionEvent;
@@ -34,7 +34,7 @@ public void actionPerformed(ActionEvent e) {
         if (con == null || !con) {
             return;
         }
-        LocalSyncTransactionCommitListener listener = LocalSyncProjectEventListenerAdapter.getProjectMapping(Application.getInstance().getProject()).getLocalSyncTransactionCommitListener();
+        LocalDeltaTransactionCommitListener listener = LocalDeltaProjectEventListenerAdapter.getProjectMapping(Application.getInstance().getProject()).getLocalDeltaTransactionCommitListener();
         if (listener != null) {
             listener.setDisabled(true);
         }

src/main/java/gov/nasa/jpl/mbee/mdk/docgen/table/EditableTable.java

@@ -231,7 +231,7 @@ private void importFromCsv(CSVReader reader) throws IOException {
                     PropertyEnum whatToChange = null;
                     BaseElement e = Converters.getIdToElementConverter()
                             .apply(props[c], project);
-                    String value = props[c + 1];
+                    String value = c + 1 < props.length ? props[c + 1] : "";
                     if (what != null && what.size() > row && what.get(row).size() > col) {
                         whatToChange = what.get(row).get(col);
                     }

src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java

@@ -110,7 +110,7 @@ public static String getEID(EObject eObject) {
             return Converters.getIProjectToIdConverter().apply(project.getPrimaryProject()) + MDKConstants.PRIMARY_MODEL_ID_SUFFIX;
         }
 
-        // local projects don't properly maintain the ids of some elements. this id spoofing mitigates that for us, but can mess up the jms sync counts in some cases (annoying, but ultimately harmless)
+        // local projects don't properly maintain the ids of some elements. this id spoofing mitigates that for us, but can mess up the MMS delta counts in some cases (annoying, but ultimately harmless)
         // NOTE - this spoofing is replicated in LocalSyncTransactionListener in order to properly add / remove elements in the unsynched queue. any updates here should be replicated there as well.
         if (element instanceof InstanceSpecification && ((InstanceSpecification) element).getStereotypedElement() != null) {
             return getEID(((InstanceSpecification) element).getStereotypedElement()) + MDKConstants.APPLIED_STEREOTYPE_INSTANCE_ID_SUFFIX;

src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFImporter.java

@@ -234,7 +234,6 @@ else if (eStructuralFeature instanceof EReference) {
             }
             String id = jsonNode.asText();
             Element referencedElement = getIdToElementConverter().apply(id, project);
-            System.out.println("[LOOKUP] " + id + " -> " + referencedElement);
             if (referencedElement == null) {
                 if (strict) {
                     throw new ReferenceException(element, objectNode, "Could not find referenced element " + id + " in model for key \"" + key + "\" in JSON.");

src/main/java/gov/nasa/jpl/mbee/mdk/generator/ViewPresentationGenerator.java

@@ -27,8 +27,8 @@
 import gov.nasa.jpl.mbee.mdk.mms.MMSUtils;
 import gov.nasa.jpl.mbee.mdk.mms.json.JsonEquivalencePredicate;
 import gov.nasa.jpl.mbee.mdk.mms.json.JsonPatchFunction;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncProjectEventListenerAdapter;
-import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalSyncTransactionCommitListener;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaProjectEventListenerAdapter;
+import gov.nasa.jpl.mbee.mdk.mms.sync.local.LocalDeltaTransactionCommitListener;
 import gov.nasa.jpl.mbee.mdk.mms.validation.ImageValidator;
 import gov.nasa.jpl.mbee.mdk.model.DocBookOutputVisitor;
 import gov.nasa.jpl.mbee.mdk.model.Document;
@@ -112,9 +112,6 @@ public void run(ProgressStatus progressStatus) {
         Map<String, ViewMapping> viewMap = new LinkedHashMap<>();
 
         for (Element rootView : rootViews) {
-            if (MDUtils.isDeveloperMode()) {
-                //Application.getInstance().getGUILog().log("Generating " + rootView.getHumanName() + " (" + rootView.getLocalID() + ").");
-            }
             // STAGE 1: Calculating view structure
             progressStatus.setDescription("Calculating view structure");
             progressStatus.setCurrent(1);
@@ -136,11 +133,16 @@ public void run(ProgressStatus progressStatus) {
                 failure = true;
                 return;
             }
-
-            DocBookOutputVisitor docBookOutputVisitor = new DocBookOutputVisitor(true);
-            dge.accept(docBookOutputVisitor);
-
-            SessionManager.getInstance().closeSession(project);
+            DocBookOutputVisitor docBookOutputVisitor;
+            try {
+                docBookOutputVisitor = new DocBookOutputVisitor(true);
+                dge.accept(docBookOutputVisitor);
+            }
+            finally {
+                if (SessionManager.getInstance().isSessionCreated(project)) {
+                    SessionManager.getInstance().closeSession(project);
+                }
+            }
 
             DBBook book = docBookOutputVisitor.getBook();
             if (book == null) {
@@ -222,7 +224,7 @@ public void run(ProgressStatus progressStatus) {
             return;
         }
 
-        LocalSyncTransactionCommitListener localSyncTransactionCommitListener = LocalSyncProjectEventListenerAdapter.getProjectMapping(project).getLocalSyncTransactionCommitListener();
+        LocalDeltaTransactionCommitListener localDeltaTransactionCommitListener = LocalDeltaProjectEventListenerAdapter.getProjectMapping(project).getLocalDeltaTransactionCommitListener();
         Set<Element> elementsToDelete = new HashSet<>();
 
         // Create the session you intend to cancel to revert all temporary elements.
@@ -235,8 +237,8 @@ public void run(ProgressStatus progressStatus) {
             failure = true;
             return;
         }
-        if (localSyncTransactionCommitListener != null) {
-            localSyncTransactionCommitListener.setDisabled(true);
+        if (localDeltaTransactionCommitListener != null) {
+            localDeltaTransactionCommitListener.setDisabled(true);
         }
 
         // Query existing server-side JSONs for views
@@ -761,8 +763,8 @@ public List<EStructuralFeatureOverride> getEStructuralFeatureOverrides() {
             if (SessionManager.getInstance().isSessionCreated(project)) {
                 SessionManager.getInstance().cancelSession(project);
             }
-            if (localSyncTransactionCommitListener != null) {
-                localSyncTransactionCommitListener.setDisabled(false);
+            if (localDeltaTransactionCommitListener != null) {
+                localDeltaTransactionCommitListener.setDisabled(false);
             }
         }
 

src/main/java/gov/nasa/jpl/mbee/mdk/json/JacksonUtils.java

@@ -114,8 +114,7 @@ public static ObjectNode parseJsonObject(JsonParser jsonParser) throws IOExcepti
         if (current != JsonToken.START_OBJECT) {
             throw new IOException("Unable to build object from JSON parser.");
         }
-        ObjectNode objectNode = getObjectMapper().readTree(jsonParser);
-        return objectNode;
+        return getObjectMapper().readTree(jsonParser);
     }
 
     public static ArrayNode parseJsonArray(JsonParser jsonParser, ArrayNode arrayNode) throws IOException {