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;
}
platform/platform-resources-en/src/messages/XDebuggerBundle.properties
-1
View File
@@ -44,7 +44,6 @@ xbreakpoint.master.breakpoint.none=<None>
xbreakpoint.master.breakpoint.description=Disabled until selected breakpoint is hit:
rule.name.group.by.file=Group by file
xbreakpoint.default.display.text=Line {0} in {1}
xbreakpoint.group.unknown=Unknown
xbreakpoint.reached.text=Breakpoint reached:
platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/ui/XBreakpointGroupingRule.java
+1 -1
View File
@@ -53,7 +53,7 @@ public abstract class XBreakpointGroupingRule<B, G extends XBreakpointGroup> {
return XBreakpointsGroupingPriorities.DEFAULT;
}
@NotNull
@Nullable
public abstract G getGroup(@NotNull B breakpoint, @NotNull Collection<G> groups);
@Nullable
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointFileGroup.java
+1 -22
View File
@@ -15,11 +15,9 @@
*/
package com.intellij.xdebugger.impl.breakpoints.ui.grouping;
import com.intellij.icons.AllIcons;
import com.intellij.ide.presentation.VirtualFilePresentation;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -29,26 +27,8 @@ import javax.swing.*;
* @author nik
*/
public class XBreakpointFileGroup extends XBreakpointGroup {
public static final XBreakpointFileGroup UNKNOWN = new XBreakpointFileGroup() {
@NotNull
@Override
public String getName() {
return XDebuggerBundle.message("xbreakpoint.group.unknown");
}
@Nullable
@Override
public Icon getIcon(boolean isOpen) {
return AllIcons.FileTypes.Text;
}
};
private final VirtualFile myFile;
private XBreakpointFileGroup() {
myFile = null;
}
public XBreakpointFileGroup(@NotNull VirtualFile file) {
myFile = file;
}
@@ -63,7 +43,6 @@ public class XBreakpointFileGroup extends XBreakpointGroup {
return myFile.getPresentableUrl();
}
@Nullable
public VirtualFile getFile() {
return myFile;
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointFileGroupingRule.java
+3 -7
View File
@@ -16,7 +16,6 @@
package com.intellij.xdebugger.impl.breakpoints.ui.grouping;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.XSourcePosition;
@@ -42,20 +41,17 @@ public class XBreakpointFileGroupingRule<B> extends XBreakpointGroupingRule<B, X
return XBreakpointsGroupingPriorities.BY_FILE;
}
@NotNull
public XBreakpointFileGroup getGroup(@NotNull final B breakpoint, @NotNull final Collection<XBreakpointFileGroup> groups) {
if (!(breakpoint instanceof XLineBreakpoint)) {
return XBreakpointFileGroup.UNKNOWN;
return null;
}
XSourcePosition position = ((XLineBreakpoint)breakpoint).getSourcePosition();
if (position == null) {
return XBreakpointFileGroup.UNKNOWN;
}
if (position == null) return null;
VirtualFile file = position.getFile();
for (XBreakpointFileGroup group : groups) {
if (Comparing.equal(group.getFile(), file)) {
if (group.getFile().equals(file)) {
return group;
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointGroupingByTypeRule.java
+1 -2
View File
@@ -45,7 +45,6 @@ public class XBreakpointGroupingByTypeRule<B> extends XBreakpointGroupingRule<B,
return XBreakpointsGroupingPriorities.BY_TYPE;
}
@NotNull
@Override
public XBreakpointTypeGroup getGroup(@NotNull B b, @NotNull Collection<XBreakpointTypeGroup> groups) {
if (b instanceof XBreakpoint) {
@@ -57,6 +56,6 @@ public class XBreakpointGroupingByTypeRule<B> extends XBreakpointGroupingRule<B,
}
return new XBreakpointTypeGroup(breakpoint.getType());
}
return XBreakpointTypeGroup.UNKNOWN;
return null;
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/grouping/XBreakpointTypeGroup.java
+1 -16
View File
@@ -15,31 +15,17 @@
*/
package com.intellij.xdebugger.impl.breakpoints.ui.grouping;
import com.intellij.icons.AllIcons;
import com.intellij.util.ArrayUtil;
import com.intellij.xdebugger.XDebuggerBundle;
import com.intellij.xdebugger.breakpoints.XBreakpointType;
import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public class XBreakpointTypeGroup extends XBreakpointGroup {
public static final XBreakpointTypeGroup UNKNOWN = new XBreakpointTypeGroup(null) {
@NotNull
@Override
public String getName() {
return XDebuggerBundle.message("xbreakpoint.group.unknown");
}
@Override
public Icon getIcon(boolean isOpen) {
return AllIcons.Debugger.Db_set_breakpoint;
}
};
private XBreakpointType myBreakpointType;
@@ -53,7 +39,6 @@ public class XBreakpointTypeGroup extends XBreakpointGroup {
return myBreakpointType.getTitle();
}
@Nullable
public XBreakpointType getBreakpointType() {
return myBreakpointType;
}