summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbkolb2007-09-26 09:22:29 (EDT)
committer bkolb2007-09-26 09:22:29 (EDT)
commit72cd233f6fd40159fd9765d2478037618a8c6ead (patch)
treef20ccab8a161eb8d1ccd94e4dfd04d5581f89803
parent48ed7e1b707257bf61490cec1c252d5f3276d0fd (diff)
downloadorg.eclipse.mwe-72cd233f6fd40159fd9765d2478037618a8c6ead.zip
org.eclipse.mwe-72cd233f6fd40159fd9765d2478037618a8c6ead.tar.gz
org.eclipse.mwe-72cd233f6fd40159fd9765d2478037618a8c6ead.tar.bz2
minor bugfixes
-rw-r--r--plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/debug/MWEPluginAdapter.java2
-rw-r--r--plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/util/PluginConfigurationElementUtil.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/debug/MWEPluginAdapter.java b/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/debug/MWEPluginAdapter.java
index 2f2b1fc..0e18584 100644
--- a/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/debug/MWEPluginAdapter.java
+++ b/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/debug/MWEPluginAdapter.java
@@ -78,7 +78,7 @@ public class MWEPluginAdapter implements PluginAdapter {
}
public String getEditorId() {
- IConfigurationElement[] configElements = PluginConfigurationElementUtil.getConfigElements("org.eclipse.ui.editors/" + "editor[extensions=mwe, oaw]");
+ IConfigurationElement[] configElements = PluginConfigurationElementUtil.getConfigElements("org.eclipse.ui.editors/" + "editor[extensions=mwe, oaw]/id");
for (IConfigurationElement element : configElements) {
if (element.getAttribute("default").equalsIgnoreCase("true")) {
return element.getAttribute("id");
diff --git a/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/util/PluginConfigurationElementUtil.java b/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/util/PluginConfigurationElementUtil.java
index 81ec86b..421e9e2 100644
--- a/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/util/PluginConfigurationElementUtil.java
+++ b/plugins/org.eclipse.emf.mwe.ui/src/org/eclipse/emf/mwe/internal/ui/workflow/util/PluginConfigurationElementUtil.java
@@ -31,8 +31,7 @@ public class PluginConfigurationElementUtil {
}
public static IConfigurationElement[] getConfigElements(String path) {
- // "aaa/bbb[xx=yy]/ccc" or "aaa/bbb/ccc";
- Pattern p = Pattern.compile("(.+)/(.+?)(\\[(.+)=(.+)\\])?");
+ Pattern p = Pattern.compile("(.+)/(.+?)(\\[(.+)=(.+)\\])?/(.+)");
Matcher m = p.matcher(path);
if (!m.find())
return null;