Skip to content

Commit 8f4ce91

Browse files
committed
Temporarily remove ruleset GUI from ruleset editor due to NPE thrown WINDUP-3106
1 parent bfa1336 commit 8f4ce91

File tree

4 files changed

+30
-23
lines changed

4 files changed

+30
-23
lines changed

plugins/org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/OpenRuleDefinitionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
5656
Pair<Object, Node> pair = XMLRulesetModelUtil.findRuleProvider(
5757
ruleId, executionBuilder.getSystemRuleProviderRegistry(), modelService);
5858
if (pair != null) {
59-
XMLRulesetModelUtil.openRuleInEditor(pair.getFirst(), pair.getSecond());
59+
XMLRulesetModelUtil.openRuleInEditor(pair.getFirst(), pair.getSecond(), RulesetEditor.ID);
6060
}
6161
} catch (RemoteException e) {
6262
WindupUIPlugin.log(e);

plugins/org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RuleRepositoryContentProvider.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@ else if (parentElement instanceof RuleProvider) {
9797
RuleProvider provider = (RuleProvider)parentElement;
9898
List<Object> children = Lists.newArrayList();
9999
children.add(new RulesetFileNode(provider, new File(provider.getOrigin()), provider.getRuleProviderType()));
100-
List<Node> ruleNodes = XMLRulesetModelUtil.getRules(provider.getOrigin());
101-
ruleNodes.forEach(node -> nodeMap.put(node, provider));
102-
children.addAll(ruleNodes);
100+
// List<Node> ruleNodes = XMLRulesetModelUtil.getRules(provider.getOrigin());
101+
// ruleNodes.forEach(node -> nodeMap.put(node, provider));
102+
// children.addAll(ruleNodes);
103103
return children.stream().toArray(Object[]::new);
104104
}
105105
else if (parentElement instanceof CustomRuleProvider) {
106106
CustomRuleProvider provider = (CustomRuleProvider)parentElement;
107107
List<Object> children = Lists.newArrayList();
108108
children.add(new RulesetFileNode(provider, new File(provider.getLocationURI()), RuleProviderType.XML));
109-
List<Node> ruleNodes = XMLRulesetModelUtil.getRules(provider.getLocationURI());
110-
ruleNodes.forEach(node -> nodeMap.put(node, provider));
111-
children.addAll(ruleNodes);
109+
// List<Node> ruleNodes = XMLRulesetModelUtil.getRules(provider.getLocationURI());
110+
// ruleNodes.forEach(node -> nodeMap.put(node, provider));
111+
// children.addAll(ruleNodes);
112112
listen(provider);
113113
return children.stream().toArray(Object[]::new);
114114
}
@@ -277,12 +277,12 @@ public StyledString getStyledText(Object element) {
277277
if (element instanceof SystemRulesNode && ((SystemRulesNode)element).getChildren().length == 0) {
278278
style.append(" [" + "Start MTA to view the system rules" + "]", StyledString.DECORATIONS_STYLER);
279279
}
280-
else if (element instanceof CustomRuleProvider || element instanceof RuleProvider) {
281-
style.append(" (" + (getChildren(element).length - 1) + ")", StyledString.COUNTER_STYLER);
282-
}
283-
else if (element instanceof RulesetFileNode) {
284-
style.append(" [" + ((RulesetFileNode)element).getFile().getPath() + "]", StyledString.DECORATIONS_STYLER);
285-
}
280+
// else if (element instanceof CustomRuleProvider || element instanceof RuleProvider) {
281+
// style.append(" (" + (getChildren(element).length - 1) + ")", StyledString.COUNTER_STYLER);
282+
// }
283+
// else if (element instanceof RulesetFileNode) {
284+
// style.append(" [" + ((RulesetFileNode)element).getFile().getPath() + "]", StyledString.DECORATIONS_STYLER);
285+
// }
286286
return style;
287287
}
288288

plugins/org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RuleRepositoryView.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ public void doubleClick(DoubleClickEvent event) {
127127
if (element instanceof RulesetFileNode) {
128128
RulesetFileNode node = (RulesetFileNode)element;
129129
if (node.getRuleProvider() != null) {
130-
XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null);
130+
// XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart");
131+
XMLRulesetModelUtil.openRuleInEditor(node.getRuleProvider(), null, RulesetEditor.ID);
131132
}
132133
/*IFileStore fileStore = EFS.getLocalFileSystem().getStore(new Path(node.getFile().getParent()));
133134
fileStore = fileStore.getChild(node.getName());
@@ -148,7 +149,7 @@ else if (element instanceof Node) {
148149
Node node = (Node)element;
149150
Object provider = contentProvider.getProvider(node);
150151
if (provider != null) {
151-
XMLRulesetModelUtil.openRuleInEditor(provider, node);
152+
XMLRulesetModelUtil.openRuleInEditor(provider, node, RulesetEditor.ID);
152153
}
153154
}
154155
}
@@ -214,7 +215,7 @@ else if (resource != null && resource.exists()){
214215
}
215216
boolean exists = modelService.ruleProviderExists(resource.getFullPath().toString());
216217
if (!exists) {
217-
modelService.addRulesetRepository(rulesetLocation, resource.getFullPath().toString());
218+
modelService.addRulesetRepository(rulesetLocation, resource.getFullPath().toString());
218219
}
219220
}
220221
}

plugins/org.jboss.tools.windup.ui/src/org/jboss/tools/windup/ui/internal/rules/RulesetEditorWrapper.java

+13-7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.eclipse.e4.core.contexts.IEclipseContext;
1616
import org.eclipse.jface.text.IDocument;
1717
import org.eclipse.jface.viewers.ISelectionProvider;
18+
import org.eclipse.jface.viewers.StructuredSelection;
1819
import org.eclipse.swt.custom.CTabFolder;
1920
import org.eclipse.swt.widgets.Composite;
2021
import org.eclipse.swt.widgets.Control;
@@ -36,7 +37,7 @@
3637
@SuppressWarnings("restriction")
3738
public class RulesetEditorWrapper extends XMLMultiPageEditorPart {
3839

39-
private RulesetDesignPage designPage;
40+
// private RulesetDesignPage designPage;
4041

4142
@SuppressWarnings("rawtypes")
4243
@Override
@@ -90,7 +91,7 @@ protected IDesignViewer createDesignPage() {
9091
@Override
9192
public void dispose() {
9293
super.dispose();
93-
designPage.dispose();
94+
// designPage.dispose();
9495
}
9596

9697
@Override
@@ -99,16 +100,21 @@ public void setFocus() {
99100
}
100101

101102
public Document getDocument() {
102-
return designPage.getDocument();
103+
return (Document)this.getAdapter(IDocument.class);
104+
// return designPage.getDocument();
103105
}
104106

107+
//
105108
public void selectAndReveal(Element element) {
106-
designPage.getEditor().selectAndReveal(element);
109+
super.getEditorSite().getSelectionProvider().setSelection(new StructuredSelection(element));
110+
// designPage.getEditor().selectAndReveal(element);
107111
}
112+
//
113+
// public IElementUiDelegate getUiDelegate(Element element) {
114+
// return designPage.getEditor().getUiDelegate(element);
115+
// }
116+
108117

109-
public IElementUiDelegate getUiDelegate(Element element) {
110-
return designPage.getEditor().getUiDelegate(element);
111-
}
112118

113119
public static final class RulesetDesignPage implements IDesignViewer {
114120

0 commit comments

Comments
 (0)