Skip to content

Commit f49e452

Browse files
committed
[fix] Remove useless diagramContext in UtilService#getViewDefinitionKind
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 65b3dae commit f49e452

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

backend/services/syson-services/src/main/java/org/eclipse/syson/services/UtilService.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -976,13 +976,10 @@ public Element getViewUsageOwner(Element element) {
976976
* @param editingContext
977977
* the {@link IEditingContext} of the element. It corresponds to a variable accessible from the variable
978978
* manager.
979-
* @param diagramContext
980-
* the {@link IDiagramContext} of the element. It corresponds to a variable accessible from the variable
981-
* manager.
982979
* @return true if the given {@link Element} displayed in the given {@link IDiagramContext} is of the given
983980
* {@link ViewDefinition}, false otherwise.
984981
*/
985-
public ViewDefinitionKind getViewDefinitionKind(Element element, List<Object> ancestors, IEditingContext editingContext, IDiagramContext diagramContext) {
982+
public ViewDefinitionKind getViewDefinitionKind(Element element, List<Object> ancestors, IEditingContext editingContext) {
986983
ViewDefinitionKind kind = ViewDefinitionKind.GENERAL_VIEW;
987984
if (element instanceof ViewUsage viewUsage) {
988985
var types = viewUsage.getType();
@@ -995,7 +992,7 @@ public ViewDefinitionKind getViewDefinitionKind(Element element, List<Object> an
995992
var viewUsageContainingElement = ancestors.stream().filter(ViewUsage.class::isInstance).map(ViewUsage.class::cast).findFirst();
996993
if (viewUsageContainingElement.isPresent()) {
997994
ViewUsage viewUsage = viewUsageContainingElement.get();
998-
kind = this.getViewDefinitionKind(viewUsage, List.of(), editingContext, diagramContext);
995+
kind = this.getViewDefinitionKind(viewUsage, List.of(), editingContext);
999996
}
1000997
}
1001998
return kind;

backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewNodeService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public List<Element> getExposedElements(Element element, Element parent, EClass
140140
elementsToExpose.addAll(filteredExposedElements);
141141
// if it is not a General View, we don't want to display nested nodes as tree (i.e. sibling nodes +
142142
// composition edges), if it an ActionFlow view, we only want to display Action Nodes as root nodes, ...
143-
var viewDefKind = this.utilService.getViewDefinitionKind(viewUsage, ancestors, editingContext, diagramContext);
143+
var viewDefKind = this.utilService.getViewDefinitionKind(viewUsage, ancestors, editingContext);
144144
for (Element filteredExposedElement : filteredExposedElements) {
145145
boolean canBeDisplayed = new ViewFilterSwitch(viewDefKind, exposedElements, parent).doSwitch(filteredExposedElement);
146146
if (!canBeDisplayed) {

backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewToolService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public Element dropElementFromDiagram(Element droppedElement, Node droppedNode,
328328
* @return <code>true</code> if the tool should be available, <code>false</code> otherwise.
329329
*/
330330
public boolean toolShouldBeAvailable(Element element, IEditingContext editingContext, DiagramContext diagramContext, EClass newElementType) {
331-
ViewDefinitionKind viewDefinitionKind = this.utilService.getViewDefinitionKind(element, List.of(), editingContext, diagramContext);
331+
ViewDefinitionKind viewDefinitionKind = this.utilService.getViewDefinitionKind(element, List.of(), editingContext);
332332
var elt = this.utilService.getViewUsageOwner(element);
333333

334334
return switch (viewDefinitionKind) {

0 commit comments

Comments
 (0)