Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-08-28 13:36:02 +0000
committerptessier2014-08-28 13:36:02 +0000
commit9926e69a6d3f6dd3727636e1f056eb2da77f17b4 (patch)
treef49689acbc5a34e875486b2bbdf9384713217648 /plugins
parent3a5a320a0878b32f3c5115d36ffb5d15cf746209 (diff)
downloadorg.eclipse.papyrus-9926e69a6d3f6dd3727636e1f056eb2da77f17b4.tar.gz
org.eclipse.papyrus-9926e69a6d3f6dd3727636e1f056eb2da77f17b4.tar.xz
org.eclipse.papyrus-9926e69a6d3f6dd3727636e1f056eb2da77f17b4.zip
399858: [Documentation] Papyrus shall have an embedded documentation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=399858 Change-Id: Id17cf0d6cc6d26c60addf35afbebceb0b146a241
Diffstat (limited to 'plugins')
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java4
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java2
-rw-r--r--plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java13
3 files changed, 6 insertions, 13 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
index 6d1ef5cf91d..e55e4b9c438 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/Activator.java
@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -46,7 +46,7 @@ public class Activator extends AbstractUIPlugin {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
@Override
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
index 13bd2d8fe5d..c5bb2936838 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/command/CreateDocumentModelCommand.java
@@ -172,7 +172,7 @@ public class CreateDocumentModelCommand extends RecordingCommand {
Comment currentComment = iteComment.next();
transformToContentComment(useCaseModelOUT, currentComment);
createImageFromHyperLink(copyImageUtil, useCaseModelOUT, currentComment);
-
+
}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
index f71b29fac02..0f530f76d47 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/src/org/eclipse/papyrus/uml/developper/mde/handler/GetHTMLTextHandler.java
@@ -51,20 +51,13 @@ public class GetHTMLTextHandler extends IDMAbstractHandler {
private IProject getCurrentProject() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IWorkspaceRoot root = workspace.getRoot();
-<<<<<<< HEAD
- IProject project = root.getProject();
- String path=getSelection().eResource().getURI().path();
- String tmpPath=path.replaceAll("/resource/","");
- for(IProject currentProject : root.getProjects()) {
- if( tmpPath.startsWith(currentProject.getName())){
- project=currentProject;
-=======
IProject project = root.getProject();
String path = getSelection().eResource().getURI().path();
+ String tmpPath = path.replaceAll("/resource/", "");
for (IProject currentProject : root.getProjects()) {
- if (path.contains(currentProject.getName())) {
+ if (tmpPath.startsWith(currentProject.getName())) {
project = currentProject;
->>>>>>> branch 'master' of ssh://ptessier@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
+
}
}
return project;

Back to the top