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

make service not extend *Component, test added

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-01-19 13:31:10 +03:00
parent 70906b469e
commit 1f3e14b246
26 changed files with 110 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
-11
View File
@@ -39,23 +39,12 @@ import com.intellij.psi.PsiExpression;
import com.intellij.util.net.NetUtils;
import com.sun.jdi.Value;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
public class DebuggerUtilsImpl extends DebuggerUtilsEx{
private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsImpl");
@NotNull
public String getComponentName() {
return "DebuggerUtils";
}
public void initComponent() { }
public void disposeComponent() {
}
public PsiExpression substituteThis(PsiExpression expressionWithThis, PsiExpression howToEvaluateThis, Value howToEvaluateThisValue, StackFrameContext context)
throws EvaluateException {
return DebuggerTreeNodeExpression.substituteThis(expressionWithThis, howToEvaluateThis, howToEvaluateThisValue);
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSettings.java
+13 -37
View File
@@ -16,8 +16,7 @@
package com.intellij.debugger.settings;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.execution.ui.layout.impl.RunnerLayoutSettings;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.components.NamedComponent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.DefaultJDOMExternalizer;
@@ -34,21 +33,21 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class DebuggerSettings implements JDOMExternalizable, ApplicationComponent, Cloneable {
public class DebuggerSettings implements JDOMExternalizable, NamedComponent, Cloneable {
private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.settings.DebuggerSettings");
public static final int SOCKET_TRANSPORT = 0;
public static final int SHMEM_TRANSPORT = 1;
public static final @NonNls String SUSPEND_ALL = "SuspendAll";
public static final @NonNls String SUSPEND_THREAD = "SuspendThread";
public static final @NonNls String SUSPEND_NONE = "SuspendNone";
@NonNls public static final String SUSPEND_ALL = "SuspendAll";
@NonNls public static final String SUSPEND_THREAD = "SuspendThread";
@NonNls public static final String SUSPEND_NONE = "SuspendNone";
public static final @NonNls String EVALUATE_FRAGMENT = "EvaluateFragment";
public static final @NonNls String EVALUATE_EXPRESSION = "EvaluateExpression";
@NonNls public static final String EVALUATE_FRAGMENT = "EvaluateFragment";
@NonNls public static final String EVALUATE_EXPRESSION = "EvaluateExpression";
public static final @NonNls String RUN_HOTSWAP_ALWAYS = "RunHotswapAlways";
public static final @NonNls String RUN_HOTSWAP_NEVER = "RunHotswapNever";
public static final @NonNls String RUN_HOTSWAP_ASK = "RunHotswapAsk";
@NonNls public static final String RUN_HOTSWAP_ALWAYS = "RunHotswapAlways";
@NonNls public static final String RUN_HOTSWAP_NEVER = "RunHotswapNever";
@NonNls public static final String RUN_HOTSWAP_ASK = "RunHotswapAsk";
public boolean TRACING_FILTERS_ENABLED;
public int VALUE_LOOKUP_DELAY; // ms
@@ -75,11 +74,6 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
private Map<String, ContentState> myContentStates = new HashMap<String, ContentState>();
public void disposeComponent() {
}
public void initComponent() {}
public ClassFilter[] getSteppingFilters() {
final ClassFilter[] rv = new ClassFilter[mySteppingFilters.length];
for (int idx = 0; idx < rv.length; idx++) {
@@ -89,7 +83,7 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
}
void setSteppingFilters(ClassFilter[] steppingFilters) {
mySteppingFilters = (steppingFilters != null)? steppingFilters : ClassFilter.EMPTY_ARRAY;
mySteppingFilters = steppingFilters != null ? steppingFilters : ClassFilter.EMPTY_ARRAY;
}
@SuppressWarnings({"HardCodedStringLiteral"})
@@ -116,9 +110,8 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
@SuppressWarnings({"HardCodedStringLiteral"})
public void writeExternal(Element parentNode) throws WriteExternalException {
DefaultJDOMExternalizer.writeExternal(this, parentNode);
Element element;
for (ClassFilter mySteppingFilter : mySteppingFilters) {
element = new Element("filter");
Element element = new Element("filter");
parentNode.addContent(element);
mySteppingFilter.writeExternal(element);
}
@@ -180,17 +173,6 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
return "DebuggerSettings";
}
public ContentState getContentState(String type) {
ContentState state = myContentStates.get(type);
if (state == null) {
state = new ContentState(type);
myContentStates.put(type, state);
}
return state;
}
public static class ContentState implements Cloneable {
private final String myType;
@@ -264,7 +246,7 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
}
public double getSplitProportion(double defaultValue) {
return (mySplitProportion <= 0 || mySplitProportion >= 1) ? defaultValue : mySplitProportion;
return mySplitProportion <= 0 || mySplitProportion >= 1 ? defaultValue : mySplitProportion;
}
public void setDetached(final boolean detached) {
@@ -287,10 +269,4 @@ public class DebuggerSettings implements JDOMExternalizable, ApplicationComponen
return (ContentState)super.clone();
}
}
public RunnerLayoutSettings getLayoutSettings() {
return RunnerLayoutSettings.getInstance();
}
}