summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-01 07:58:21 (EST)
committer Stephan Born2012-04-24 04:30:09 (EDT)
commitb2506ca4f1414a81e19e05d35b28911635d5f942 (patch)
tree769fadcf81d7073d5991e3aa870c9977e703d362
parentbe16a121578e5235ae0f9b2b20713efcd2bd14be (diff)
downloadorg.eclipse.stardust.ide-b2506ca4f1414a81e19e05d35b28911635d5f942.zip
org.eclipse.stardust.ide-b2506ca4f1414a81e19e05d35b28911635d5f942.tar.gz
org.eclipse.stardust.ide-b2506ca4f1414a81e19e05d35b28911635d5f942.tar.bz2
Jira-ID: CRNT-22383 Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds (org.eclipse.stardust.modeling.repository.file)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53306 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionPropertyPage.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionPropertyPage.java b/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionPropertyPage.java
index a80399d..960ced6 100644
--- a/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionPropertyPage.java
@@ -114,11 +114,11 @@ public class FileConnectionPropertyPage extends AbstractConnectionPropertyPage
URI projectRelative = projectURI.relativize(platformRelative);
if (projectRelative != platformRelative)
{
- text.getText().setText("project:/" + projectRelative);
+ text.getText().setText("project:/" + projectRelative); //$NON-NLS-1$
return;
}
}
- text.getText().setText("platform:/" + platformRelative);
+ text.getText().setText("platform:/" + platformRelative); //$NON-NLS-1$
}
else
{
@@ -191,7 +191,7 @@ public class FileConnectionPropertyPage extends AbstractConnectionPropertyPage
SWT.ICON_WARNING | SWT.CANCEL);
messageBox.setText(File_Messages.TXT_CIRCULAR_DEPENDENCY_DETECTED);
String message = MessageFormat.format(File_Messages.MSG_IS_DIRECTLY_OR_INDIRECTLY_REFERENCED_BY_MD, new Object[]{modelID, referencedModel.getId()});
- message = message + "\n\n" + File_Messages.MSG_CIRCULAR_REFERENCES_BETWEEN_MD_FILES_ARE_NOT_ALLOWED;
+ message = message + "\n\n" + File_Messages.MSG_CIRCULAR_REFERENCES_BETWEEN_MD_FILES_ARE_NOT_ALLOWED; //$NON-NLS-1$
messageBox.setMessage(message);
messageBox.open();
return result;