From cdf3a2ce652c8a14d5cb2f8cfa8ec0539d4f8896 Mon Sep 17 00:00:00 2001 From: Susankha Date: Wed, 9 Jul 2014 19:08:36 +0530 Subject: [PATCH 1/2] fix for TOOLS-2575 --- .../plugin.xml | 30 ++++++++- .../esblinkhelper/ESBExplorerLinkHelper.java | 64 +++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/esblinkhelper/ESBExplorerLinkHelper.java diff --git a/esb/org.wso2.developerstudio.eclipse.esb.project/plugin.xml b/esb/org.wso2.developerstudio.eclipse.esb.project/plugin.xml index ac4b548ca..b88ad300b 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.project/plugin.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb.project/plugin.xml @@ -109,12 +109,14 @@ point="org.eclipse.ui.navigator.viewer"> - + + - + + @@ -161,5 +163,27 @@ - + + + + + + + + + + + + + + + + + diff --git a/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/esblinkhelper/ESBExplorerLinkHelper.java b/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/esblinkhelper/ESBExplorerLinkHelper.java new file mode 100644 index 000000000..50ab9e77b --- /dev/null +++ b/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/esblinkhelper/ESBExplorerLinkHelper.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.wso2.developerstudio.eclipse.esb.project.esblinkhelper; + +import java.util.regex.Pattern; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.navigator.ILinkHelper; +import org.eclipse.ui.part.FileEditorInput; + +public class ESBExplorerLinkHelper implements ILinkHelper{ + + @Override + public void activateEditor(IWorkbenchPage arg0, IStructuredSelection arg1) { + + } + + @Override + public IStructuredSelection findSelection(IEditorInput iEditorInput) { + + if(iEditorInput instanceof FileEditorInput){ + return getSelection((FileEditorInput) iEditorInput); + } + + return StructuredSelection.EMPTY; + } + + public IStructuredSelection getSelection(FileEditorInput fei){ + + String filePath = fei.getFile().getFullPath().toOSString(); + + filePath = filePath.replaceAll(Pattern.quote("\\"), "/"); + filePath = filePath.replaceAll("/graphical-synapse-config/", "/synapse-config/"); + filePath = filePath.replaceAll("/(endpoint_|localentry_|proxy_|sequence_|task_|template_|api_)", "/"); + filePath = filePath.replaceAll("esb_diagram$", "xml"); + + IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)); + + + return new StructuredSelection(file); + + } + +} From d153272a60ce9f71e7cdb2275c130aff47124d09 Mon Sep 17 00:00:00 2001 From: Susankha Date: Wed, 9 Jul 2014 19:25:39 +0530 Subject: [PATCH 2/2] fix for TOOLS-2565 --- .../eclipse/gmf/esb/diagram/part/EsbObjectSourceEditor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/part/EsbObjectSourceEditor.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/part/EsbObjectSourceEditor.java index 10b9a041d..601fdb3b8 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/part/EsbObjectSourceEditor.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/part/EsbObjectSourceEditor.java @@ -166,7 +166,7 @@ public void update(EsbServer server) throws Exception{//ModelObject object) { // // Avoid un-necessay refreshing. // if (!getSource().equals(newSource)) { // // Change source editor input. - getDocument().setDocumentPartitioner(new StructuredTextPartitioner()); +// getDocument().setDocumentPartitioner(new StructuredTextPartitioner()); getDocument().set(newSource); // } //