From f5911184ed2c021edd9693750027aa95375415ec Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 25 Jun 2013 16:48:48 +0200 Subject: [PATCH] WEB-8245 Debugger: Chrome extension connection message: provide balloon or clickable link --- .../xdebugger/impl/ui/tree/nodes/MessageTreeNode.java | 6 ++++-- .../src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/MessageTreeNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/MessageTreeNode.java index bee1f045ed40..94d4093e969e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/MessageTreeNode.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/MessageTreeNode.java @@ -41,7 +41,7 @@ import java.util.regex.Pattern; * @author nik */ public class MessageTreeNode extends XDebuggerTreeNode { - private boolean myEllipsis; + private final boolean myEllipsis; private XDebuggerTreeNodeHyperlink myLink; private MessageTreeNode(XDebuggerTree tree, @Nullable final XDebuggerTreeNode parent, final String message, final SimpleTextAttributes attributes, @@ -68,6 +68,7 @@ public class MessageTreeNode extends XDebuggerTreeNode { myEllipsis = false; } + @Override protected List getChildren() { return Collections.emptyList(); } @@ -82,6 +83,7 @@ public class MessageTreeNode extends XDebuggerTreeNode { return myLink; } + @Override public List getLoadedChildren() { return null; } @@ -144,7 +146,7 @@ public class MessageTreeNode extends XDebuggerTreeNode { } while (matcher.find()); - if (prev < (message.length() - 1)) { + if (prev < message.length()) { objects.add(message.substring(prev)); } return new MessageTreeNodeWithLinks(tree, objects); diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java index fe8fe0632216..79ce4a53a234 100644 --- a/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java +++ b/xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java @@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Conditions; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; @@ -34,11 +35,11 @@ import java.awt.event.MouseEvent; * @author nik */ public class OpenUrlHyperlinkInfo implements HyperlinkWithPopupMenuInfo { - private String myUrl; + private final String myUrl; private final Condition mySuitableBrowsers; public OpenUrlHyperlinkInfo(@NotNull String url) { - this(url, Condition.TRUE); + this(url, Conditions.alwaysTrue()); } public OpenUrlHyperlinkInfo(@NotNull String url, @NotNull Condition suitableBrowsers) {