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

reverted fix for IDEA-122637

Browse Source
This commit is contained in:
Egor.Ushakov
2014-03-25 16:36:00 +04:00
parent 1896ad2c78
commit 4c49d4f550
10 changed files with 13 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointClassGroup.java
-8
View File
@@ -17,7 +17,6 @@ package com.intellij.debugger.ui;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.util.PlatformIcons;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -26,13 +25,6 @@ import javax.swing.*;
public class XBreakpointClassGroup extends XBreakpointGroup {
private static final String DEFAULT_PACKAGE_NAME = DebuggerBundle.message("default.package.name");
public static final XBreakpointClassGroup UNKNOWN = new XBreakpointClassGroup("", "") {
@NotNull
@Override
public String getName() {
return XDebuggerBundle.message("xbreakpoint.group.unknown");
}
};
private String myPackageName;
private String myClassName;
java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByClassRule.java
+3 -4
View File
@@ -42,18 +42,17 @@ class XBreakpointGroupingByClassRule<B> extends XBreakpointGroupingRule<B, XBrea
return XBreakpointsGroupingPriorities.BY_CLASS;
}
@NotNull
@Override
public XBreakpointClassGroup getGroup(@NotNull B b, @NotNull Collection<XBreakpointClassGroup> groups) {
if (b instanceof XBreakpoint) {
Breakpoint javaBreakpoint = BreakpointManager.findBreakpoint((XBreakpoint)b);
if (javaBreakpoint == null) {
return XBreakpointClassGroup.UNKNOWN;
return null;
}
String className = javaBreakpoint.getShortClassName();
String packageName = javaBreakpoint.getPackageName();
if (className == null) {
return XBreakpointClassGroup.UNKNOWN;
return null;
}
for (XBreakpointClassGroup group : groups) {
if (group.getClassName().equals(className) && group.getPackageName().equals(packageName)) {
@@ -62,7 +61,7 @@ class XBreakpointGroupingByClassRule<B> extends XBreakpointGroupingRule<B, XBrea
}
return new XBreakpointClassGroup(packageName, className);
}
return XBreakpointClassGroup.UNKNOWN;
return null;
}
@Nullable
java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByPackageRule.java
+1 -2
View File
@@ -39,7 +39,6 @@ public class XBreakpointGroupingByPackageRule<B> extends XBreakpointGroupingRule
return XBreakpointsGroupingPriorities.BY_PACKAGE;
}
@NotNull
@Override
public XBreakpointPackageGroup getGroup(@NotNull B breakpoint, @NotNull Collection<XBreakpointPackageGroup> groups) {
String packageName = null;
@@ -50,7 +49,7 @@ public class XBreakpointGroupingByPackageRule<B> extends XBreakpointGroupingRule
}
}
if (packageName == null) {
return XBreakpointPackageGroup.UNKNOWN;
return null;
}
for (XBreakpointPackageGroup group : groups) {
if (StringUtil.equals(group.getPackageName(), packageName)) {
java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointPackageGroup.java
+2 -15
View File
@@ -18,30 +18,17 @@ package com.intellij.debugger.ui;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.PlatformIcons;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public class XBreakpointPackageGroup extends XBreakpointGroup {
private static final String DEFAULT_PACKAGE_NAME = DebuggerBundle.message("default.package.name");
public static final XBreakpointPackageGroup UNKNOWN = new XBreakpointPackageGroup() {
@NotNull
@Override
public String getName() {
return XDebuggerBundle.message("xbreakpoint.group.unknown");
}
};
private String myPackageName;
private XBreakpointPackageGroup() {
myPackageName = null;
}
public XBreakpointPackageGroup(@NotNull String packageName) {
public XBreakpointPackageGroup(String packageName) {
myPackageName = packageName;
}
@@ -57,7 +44,7 @@ public class XBreakpointPackageGroup extends XBreakpointGroup {
return StringUtil.isEmpty(packageName) ? DEFAULT_PACKAGE_NAME : packageName;
}
@Nullable
@NotNull
public String getPackageName() {
return myPackageName;
}