Skip to content

Commit

Permalink
[releng] Update Capella code according Sirius 7.4.0-S20240215-101501
Browse files Browse the repository at this point in the history
Signed-off-by: Séraphin Costa <seraphin.costa@obeosoft.com>
  • Loading branch information
scosta-obeo authored and pdulth committed Feb 20, 2024
1 parent d4914fb commit f0b51ba
Showing 1 changed file with 6 additions and 10 deletions.
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2006, 2020 THALES GLOBAL SERVICES.
* Copyright (c) 2006, 2024 THALES GLOBAL SERVICES.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -12,8 +12,6 @@
*******************************************************************************/
package org.polarsys.capella.core.transition.diagram.commands;

import static org.polarsys.capella.common.helpers.cache.ModelCache.getCache;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -91,19 +89,16 @@
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.cs.Component;
import org.polarsys.capella.core.data.cs.Part;
import org.polarsys.capella.core.data.pa.PhysicalArchitecture;
import org.polarsys.capella.core.diagram.helpers.DiagramHelper;
import org.polarsys.capella.core.model.handler.helpers.RepresentationHelper;
import org.polarsys.capella.core.model.helpers.BlockArchitectureExt;
import org.polarsys.capella.core.model.helpers.ComponentExt;
import org.polarsys.capella.core.sirius.analysis.CapellaServices;
import org.polarsys.capella.core.sirius.analysis.DDiagramContents;
import org.polarsys.capella.core.sirius.analysis.DiagramServices;
import org.polarsys.capella.core.sirius.analysis.ShapeUtil;
import org.polarsys.capella.core.sirius.analysis.tool.HashMapSet;
import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
import org.polarsys.capella.core.transition.diagram.Activator;
import org.polarsys.capella.core.transition.diagram.commands.DiagramTransitionRunnable.ExtendedViewRefactorHelper;
import org.polarsys.capella.core.transition.diagram.handlers.DiagramDescriptionHelper;
import org.polarsys.capella.core.transition.diagram.helpers.TraceabilityHelper;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
Expand Down Expand Up @@ -977,7 +972,7 @@ protected void copyDDiagramLayout(DSemanticDiagram sourceDiagram, DSemanticDiagr
}

// --- Sirius SHARED DATA : Clean to avoid ArrangeLayout on diagram opening ---//
cleanArrangeLayout(targetDiagram);
cleanArrangeLayout(targetDiagram, tgtDiagram);

copyNotes(srcDiagram, tgtDiagram, sourceEditPart, targetEditPart);
}
Expand All @@ -986,13 +981,14 @@ protected void copyDDiagramLayout(DSemanticDiagram sourceDiagram, DSemanticDiagr
* This method should not exists. Prevent an ArrangeLayout on diagram opening by removing some shared informations
* stored
*/
protected void cleanArrangeLayout(DSemanticDiagram targetDiagram) {
protected void cleanArrangeLayout(DSemanticDiagram targetDDiagram, Diagram targetGMFDiagram) {

// Perform an empty arrange layout on target diagram.
new DiagramDialectArrangeOperation().arrange(null, targetDiagram);
new DiagramDialectArrangeOperation().arrange(null, targetDDiagram);

// Clean ArrangeLayout shared map to avoid ArrageLayout on opening
SiriusLayoutDataManager.INSTANCE.getCreatedViewForLayoutAll().clear();

SiriusLayoutDataManager.INSTANCE.removeLayoutViews(targetGMFDiagram);
}

/**
Expand Down

0 comments on commit f0b51ba

Please sign in to comment.