MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

explicitly specify java language for built-in java data renderers (Fixing

Browse Source 
NodeRendererSettingsTest.testAutoRendererConfigurable)
This commit is contained in:
Eugene Zhuravlev
2011-12-13 21:19:02 +01:00
parent c7efe3208d
commit a69a250a93
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+13 -4
View File
@@ -297,10 +297,19 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
}
public static boolean elementsEqual(Element e1, Element e2) {
if(e1 == null) return e2 == null;
return Comparing.equal(e1.getName(), e2.getName()) &&
elementListsEqual ((List<Element> )e1.getChildren (), (List<Element> )e2.getChildren ()) &&
attributeListsEqual((List<Attribute>)e1.getAttributes(), (List<Attribute>)e2.getAttributes());
if(e1 == null) {
return e2 == null;
}
if (!Comparing.equal(e1.getName(), e2.getName())) {
return false;
}
if (!elementListsEqual ((List<Element>)e1.getChildren(), (List<Element>)e2.getChildren())) {
return false;
}
if (!attributeListsEqual((List<Attribute>)e1.getAttributes(), (List<Attribute>)e2.getAttributes())) {
return false;
}
return true;
}
@SuppressWarnings({"HardCodedStringLiteral"})
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+7 -6
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.util.EventDispatcher;
@@ -348,9 +349,9 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
private ExpressionChildrenRenderer createExpressionChildrenRenderer(@NonNls String expressionText, @NonNls String childrenExpandableText) {
final ExpressionChildrenRenderer childrenRenderer = new ExpressionChildrenRenderer();
childrenRenderer.setChildrenExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText));
childrenRenderer.setChildrenExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", StdFileTypes.JAVA));
if (childrenExpandableText != null) {
childrenRenderer.setChildrenExpandable(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, childrenExpandableText));
childrenRenderer.setChildrenExpandable(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, childrenExpandableText, "", StdFileTypes.JAVA));
}
return childrenRenderer;
}
@@ -360,7 +361,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
if (expressions != null && expressions.length > 0) {
final ArrayList<Pair<String, TextWithImports>> childrenList = new ArrayList<Pair<String, TextWithImports>>(expressions.length);
for (final String[] expression : expressions) {
childrenList.add(new Pair<String, TextWithImports>(expression[0], new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expression[1])));
childrenList.add(new Pair<String, TextWithImports>(expression[0], new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expression[1], "", StdFileTypes.JAVA)));
}
childrenRenderer.setChildren(childrenList);
}
@@ -383,7 +384,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
return evaluated + postfix;
}
};
labelRenderer.setLabelExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText));
labelRenderer.setLabelExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, expressionText, "", StdFileTypes.JAVA));
return labelRenderer;
}
@@ -399,8 +400,8 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
private MapEntryLabelRenderer() {
super("java.util.Map$Entry");
myKeyExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getKey()"));
myValueExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getValue()"));
myKeyExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getKey()", "", StdFileTypes.JAVA));
myValueExpression.setReferenceExpression(new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "this.getValue()", "", StdFileTypes.JAVA));
}
public Icon calcValueIcon(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws EvaluateException {