Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas FAUVERGUE2016-12-09 23:45:01 +0000
committerGerrit Code Review @ Eclipse.org2016-12-12 09:05:15 +0000
commitf9263edfd5e1b9381190c63a9781213290df3f9d (patch)
treea06a65c0b8985c2b90e53005c6a77364106442ae /plugins/infra
parentf322a843964826fa916026e17958a22d2ffb6aa2 (diff)
downloadorg.eclipse.papyrus-f9263edfd5e1b9381190c63a9781213290df3f9d.tar.gz
org.eclipse.papyrus-f9263edfd5e1b9381190c63a9781213290df3f9d.tar.xz
org.eclipse.papyrus-f9263edfd5e1b9381190c63a9781213290df3f9d.zip
Bug 508989: [Internationalization] Error log appear when loading a model
into a sub-folder of project https://bugs.eclipse.org/bugs/show_bug.cgi?id=508989 - Try to load the project container and, if this is not possible, load the parent folder. Change-Id: Ifd4a451462e5d213715db6e24933c37bd14f14a9 Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
index 82b2b016d3a..60baacf8d45 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
@@ -268,7 +268,11 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
IContainer parentFolder = null;
if (folderURI.isPlatformResource()) {
final String uriPlatformString = folderURI.toPlatformString(true);
- parentFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(uriPlatformString));
+ try{
+ parentFolder = ResourcesPlugin.getWorkspace().getRoot().getProject(uriPlatformString);
+ }catch(Exception exception){
+ parentFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(uriPlatformString));
+ }
}
if (null != parentFolder) {

Back to the top