Open rulesets w/in default xml editor.

windup · Jul 21, 2021 · bb3fcae · bb3fcae
1 parent 8f4ce91
commit bb3fcae
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/...ols.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/OpenRuleDefinitionHandler.java b/...ols.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/OpenRuleDefinitionHandler.java
@@ -56,7 +56,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 					Pair<Object, Node> pair = XMLRulesetModelUtil.findRuleProvider(
 							ruleId, executionBuilder.getSystemRuleProviderRegistry(), modelService);
 					if (pair != null) {
-						XMLRulesetModelUtil.openRuleInEditor(pair.getFirst(), pair.getSecond(), RulesetEditor.ID);
+						XMLRulesetModelUtil.openRuleInEditor(pair.getFirst(), pair.getSecond(), RulesetEditor.XML_EDITOR);
 					}
 				} catch (RemoteException e) {
 					WindupUIPlugin.log(e);

diff --git a/...boss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RuleRepositoryView.java b/...boss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RuleRepositoryView.java
@@ -127,8 +127,8 @@ public void doubleClick(DoubleClickEvent event) {
 					if (element instanceof RulesetFileNode) {
 						RulesetFileNode node = (RulesetFileNode)element;
 						if (node.getRuleProvider() != null) {
-//							XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart");
-							XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, RulesetEditor.ID);
+							XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, RulesetEditor.XML_EDITOR);
+							// XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, RulesetEditor.ID);
 						}
 						/*IFileStore fileStore = EFS.getLocalFileSystem().getStore(new Path(node.getFile().getParent()));
 						fileStore = fileStore.getChild(node.getName());
@@ -149,7 +149,8 @@ else if (element instanceof Node) {
 						Node node = (Node)element;
 						Object provider = contentProvider.getProvider(node);
 						if (provider != null) {
-							XMLRulesetModelUtil.openRuleInEditor(provider, node, RulesetEditor.ID);
+							XMLRulesetModelUtil.openRuleInEditor(provider, null, RulesetEditor.XML_EDITOR);
+							// XMLRulesetModelUtil.openRuleInEditor(provider, node, RulesetEditor.ID);
 						}
 					}
 				}

diff --git a/...org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RulesetEditor.java b/...org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RulesetEditor.java
@@ -48,6 +48,8 @@ public class RulesetEditor {
 
 	private static final String SASH_LEFT = "weightLeft"; //$NON-NLS-1$
 	private static final String SASH_RIGHT = "weightRight"; //$NON-NLS-1$
+
+	public static final String XML_EDITOR = "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart" //$NON-NLS-1$
 
 	private static final int SASH_LEFT_DEFAULT = 238;
 	private static final int SASH_RIGHT_DEFAULT = 685;

diff --git a/...tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/xml/XMLRulesetModelUtil.java b/...tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/xml/XMLRulesetModelUtil.java
@@ -105,6 +105,7 @@ public static IFile createLinkedResource(String location) {
 			try {
 				op1.execute(monitor, WorkspaceUndoUtil.getUIInfoAdapter(shell));
 			} catch (final ExecutionException e) {
+				e.printStackTrace();
 				WindupUIPlugin.log(e);
 			}
 		};
@@ -217,17 +218,52 @@ public static IDOMModel getModel(IFile file, boolean edit) {
 				return (IDOMModel) model;
 			}
 		} catch (IOException | CoreException e) {
+			e.printStackTrace();
 			WindupUIPlugin.log(e);
 		}
 		return null;
 	}
 
-	public static void openRuleInEditor(Object provider, Node ruleNode) {
+	public static void openSystemRuleInEditor(Object provider, Node ruleNode) {
 		IFile file = XMLRulesetModelUtil.getRuleset(provider);
 		if (file != null && file.exists()) {
 			try {
 				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = IDE.openEditor(page, file);
+//				IEditorPart editor = IDE.openEditor(page, file);
+				IEditorPart editor = IDE.openEditor(page, file, RulesetEditor.XML_EDITOR);
+				if (editor != null && ruleNode != null) {
+					if (editor instanceof RulesetEditorWrapper) {
+						((RulesetEditorWrapper)editor).selectAndReveal((Element)ruleNode);
+					}
+					else {
+						editor.getSite().getSelectionProvider().setSelection(new StructuredSelection(ruleNode));
+						ITextEditor textEditor = editor.getAdapter(ITextEditor.class);
+						if (ruleNode instanceof IndexedRegion && textEditor != null) {
+							int start = ((IndexedRegion) ruleNode).getStartOffset();
+							int length = ((IndexedRegion) ruleNode).getEndOffset() - start;
+							if ((start > -1) && (length > -1)) {
+								textEditor.selectAndReveal(start, length);
+							}
+						}
+					}
+				}
+			} catch (PartInitException e) {
+				WindupUIPlugin.log(e);
+		    		MessageDialog.openError(
+						Display.getDefault().getActiveShell(), 
+						Messages.openRuleset, 
+						Messages.errorOpeningRuleset);
+			}
+		}
+	}
+
+	public static void openRuleInEditor(Object provider, Node ruleNode, String editorId) {
+		IFile file = XMLRulesetModelUtil.getRuleset(provider);
+		if (file != null && file.exists()) {
+			try {
+				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+//				IEditorPart editor = IDE.openEditor(page, file);
+				IEditorPart editor = IDE.openEditor(page, file, editorId);
 				if (editor != null && ruleNode != null) {
 					if (editor instanceof RulesetEditorWrapper) {
 						((RulesetEditorWrapper)editor).selectAndReveal((Element)ruleNode);