diff options
| author | Pierre-Charles David | 2015-09-24 07:30:38 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-09-24 14:36:17 +0000 |
| commit | 3c9baf6b5a2ce26ac357c0dfefeee81238d88fc7 (patch) | |
| tree | 446b30a9c3268f0aed352c0eef9176fc1b88dfbe | |
| parent | c7964b27d1a15569b96cf4e1cc85bcbf3ac5f33c (diff) | |
| download | org.eclipse.sirius-3c9baf6b5a2ce26ac357c0dfefeee81238d88fc7.tar.gz org.eclipse.sirius-3c9baf6b5a2ce26ac357c0dfefeee81238d88fc7.tar.xz org.eclipse.sirius-3c9baf6b5a2ce26ac357c0dfefeee81238d88fc7.zip | |
[472057] Fix broken string externalization
Externalized template strings were returned raw instead of used in a
MessageFormat.format().
Bug: 472057
Change-Id: Ibd785dc6ee1ae899c11bd7211939933f55457a5d
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java index 23bcf0fd15..8a2b52c437 100644 --- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java +++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/ConfigurationImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.sirius.diagram.layoutdata.tools.internal.util.configuration; +import java.text.MessageFormat; + import org.eclipse.sirius.diagram.layoutdata.tools.Messages; import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.Configuration; import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.EdgeConfiguration; @@ -75,7 +77,7 @@ public class ConfigurationImpl implements Configuration { */ @Override public String toString() { - return Messages.ConfigurationImpl_toString; + return MessageFormat.format(Messages.ConfigurationImpl_toString, nodeConfiguration, edgeConfiguration); } } diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java index 607506f4cc..a7f5ab466a 100644 --- a/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java +++ b/plugins/org.eclipse.sirius.diagram.layoutdata/src/org/eclipse/sirius/diagram/layoutdata/tools/internal/util/configuration/EdgeConfigurationImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.sirius.diagram.layoutdata.tools.internal.util.configuration; +import java.text.MessageFormat; + import org.eclipse.sirius.diagram.layoutdata.tools.Messages; import org.eclipse.sirius.diagram.layoutdata.tools.api.util.configuration.EdgeConfiguration; @@ -47,7 +49,7 @@ public class EdgeConfigurationImpl implements EdgeConfiguration { */ @Override public String toString() { - return Messages.EdgeConfigurationImpl_toString; + return MessageFormat.format(Messages.EdgeConfigurationImpl_toString, getDistanceAroundPointsOfEdgeBendpointsList()); } } |