[570055] Avoid to adapt node label when it is on border

There is no reason to change the location and size of a label if this
last is on the border of its parent node. This change seems not
mandatory. Indeed, a recent change, commit 753dc1ed [1], has a side
effect to also fix this problem. But the analysis of this issue shows
that the code in
org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.styles.SimpleStyleConfiguration.adaptNodeLabel(DNode,
SiriusWrapLabel) is not necessary for label on border.

The test IconRefreshTests has been updated to reveal the problem. The
test fails without this fix and without the commit [1].
For that, in this commit:
* The VSM has been updated to add a conditional style to reveal the
problem.
* The VSM has been updated to add a Node with label on border to confirm
that the problem is only for border node with label on border.
* The semantic model has been fixed (it was wrong).
* The diagram of the aird file has just been refreshed.

[1] https://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?h=v6.4.x&id=753dc1ed3a8a1d768c63f3d4618356efc017ccbd

Bug: 570055
Change-Id: I6ee25c3c455d81e11b0b8a2ae979543f8490bc12
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
5 files changed
tree: 7402ea80095145b96a2198aa6da814808fd77729
  1. packaging/
  2. plugins/
  3. releng/
  4. .gitattributes
  5. .gitignore
  6. build.sh
  7. CONTRIBUTING
  8. Jenkinsfile
  9. LICENSE
  10. NOTICE
  11. pom.xml
  12. README.md
README.md

Eclipse Sirius

Build Status

Sirius enables the specification of a modeling workbench in terms of graphical, table or tree editors with validation rules and actions using declarative descriptions.

For more details see the project page and the main wiki page.

Building

The build uses Tycho. To launch a complete build, issue

mvn clean package

from the top-level directory. The resulting update-site (p2 repository) can be found in packaging/org.eclipse.sirius.update/target/repository.

By default the build uses a Neon-based target platform. You can specify a different platform like this:

mvn clean package -Dplatform-version-name=name

where name can be any of the following values:

  • mars (Eclipse 4.5)
  • neon (Eclipse 4.6, the default and reference target platform)
  • canary (uses nightly builds of all our dependencies, only used for testing)

The corresponding target platform definitions can be found in releng/org.eclipse.sirius.targets.