diff options
Diffstat (limited to 'platform/usageView/src/com/intellij')
3 files changed, 5 insertions, 6 deletions
diff --git a/platform/usageView/src/com/intellij/usages/impl/GroupNode.java b/platform/usageView/src/com/intellij/usages/impl/GroupNode.java index 44e33ef3632a..ac4079d1309e 100644 --- a/platform/usageView/src/com/intellij/usages/impl/GroupNode.java +++ b/platform/usageView/src/com/intellij/usages/impl/GroupNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -294,8 +294,8 @@ public class GroupNode extends Node implements Navigatable, Comparable<GroupNode protected boolean isDataReadOnly() { Enumeration enumeration = children(); while (enumeration.hasMoreElements()) { - Node node = (Node)enumeration.nextElement(); - if (node.isReadOnly()) return true; + Object element = enumeration.nextElement(); + if (element instanceof Node && ((Node)element).isReadOnly()) return true; } return false; } diff --git a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java index 170d1802eee4..8771ef75502b 100644 --- a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java +++ b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java @@ -327,7 +327,7 @@ class SearchForUsagesRunnable implements Runnable { @Override public void run() { notifyByFindBalloon(null, MessageType.WARNING, myProcessPresentation, myProject, - Collections.singletonList(UsageViewManagerImpl.getProgressTitle(myPresentation))); + Collections.singletonList(StringUtil.escapeXml(UsageViewManagerImpl.getProgressTitle(myPresentation)))); findStartedBalloonShown.set(true); } }, 300, ModalityState.NON_MODAL); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java index b9fc77295d62..a33bc9e48437 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java @@ -196,8 +196,7 @@ public class UsageViewManagerImpl extends UsageViewManager { public static String getProgressTitle(@NotNull UsageViewPresentation presentation) { final String scopeText = presentation.getScopeText(); String usagesString = StringUtil.capitalize(presentation.getUsagesString()); - String result = UsageViewBundle.message("progress.searching.for.in", usagesString, scopeText); - return StringUtil.escapeXml(result); + return UsageViewBundle.message("progress.searching.for.in", usagesString, scopeText); } void showToolWindow(boolean activateWindow) { |