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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
irengrig
2010-11-23 16:11:04 +03:00
parent e25d3c4736 39c76001c6
commit b6ca9a3d2c
3 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java
-2
View File
@@ -151,14 +151,12 @@ public abstract class ChooseLibrariesDialogBase extends DialogWrapper {
myBuilder.initRootNode();
myTree.setDragEnabled(false);
myTree.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
myTree.setRowHeight(Icons.CLASS_ICON.getIconHeight());
myTree.setShowsRootHandles(true);
UIUtil.setLineStyleAngled(myTree);
myTree.setRootVisible(false);
myTree.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
myTree.addTreeSelectionListener(new TreeSelectionListener() {
public void valueChanged(final TreeSelectionEvent e) {
updateOKAction();
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+16 -9
View File
@@ -336,7 +336,7 @@ public class XDebugSessionImpl implements XDebugSession {
private void doResume() {
myDispatcher.getMulticaster().beforeSessionResume();
myDebuggerManager.updateExecutionPosition(this, null, false);
myDebuggerManager.setActiveSession(this, null, false);
mySuspendContext = null;
myCurrentStackFrame = null;
myCurrentPosition = null;
@@ -362,18 +362,25 @@ public class XDebugSessionImpl implements XDebugSession {
boolean frameChanged = myCurrentStackFrame != frame;
myCurrentStackFrame = frame;
XSourcePosition position = frame.getSourcePosition();
if (position != null) {
XExecutionStack activeExecutionStack = mySuspendContext.getActiveExecutionStack();
boolean isTopFrame = activeExecutionStack != null && activeExecutionStack.getTopFrame() == frame;
myDebuggerManager.updateExecutionPosition(this, position, !isTopFrame);
}
activateSession();
if (frameChanged) {
myDispatcher.getMulticaster().stackFrameChanged();
}
}
public void activateSession() {
XSourcePosition position = myCurrentStackFrame != null ? myCurrentStackFrame.getSourcePosition() : null;
if (position != null) {
XExecutionStack activeExecutionStack = mySuspendContext.getActiveExecutionStack();
boolean isTopFrame = activeExecutionStack != null && activeExecutionStack.getTopFrame() == myCurrentStackFrame;
myDebuggerManager.setActiveSession(this, position, !isTopFrame);
}
else {
myDebuggerManager.setActiveSession(this, null, false);
}
}
public void updateBreakpointPresentation(@NotNull final XLineBreakpoint<?> breakpoint, @Nullable final Icon icon, @Nullable final String errorMessage) {
CustomizedBreakpointPresentation presentation;
synchronized (myRegisteredBreakpoints) {
@@ -484,7 +491,7 @@ public class XDebugSessionImpl implements XDebugSession {
myPaused = true;
if (myCurrentPosition != null) {
myDebuggerManager.updateExecutionPosition(this, myCurrentPosition, false);
myDebuggerManager.setActiveSession(this, myCurrentPosition, false);
}
UIUtil.invokeLaterIfNeeded(new Runnable() {
public void run() {
@@ -516,7 +523,7 @@ public class XDebugSessionImpl implements XDebugSession {
myCurrentPosition = null;
myCurrentStackFrame = null;
mySuspendContext = null;
myDebuggerManager.updateExecutionPosition(this, null, false);
myDebuggerManager.setActiveSession(this, null, false);
XBreakpointManagerImpl breakpointManager = myDebuggerManager.getBreakpointManager();
breakpointManager.removeBreakpointListener(myBreakpointListener);
breakpointManager.getDependentBreakpointManager().removeListener(myDependentBreakpointListener);
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
+26 -23
View File
@@ -38,7 +38,6 @@ import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.impl.http.HttpVirtualFile;
import com.intellij.util.containers.HashMap;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.xmlb.annotations.Property;
import com.intellij.xdebugger.*;
@@ -65,19 +64,17 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
private final Project myProject;
private final XBreakpointManagerImpl myBreakpointManager;
private final Map<ProcessHandler, XDebugSessionData> mySessionData;
private final Map<ProcessHandler, XDebugSessionTab> mySessionTabs;
private final List<XDebugSessionImpl> mySessions;
private final Map<ProcessHandler, XDebugSessionImpl> mySessions;
private final ExecutionPointHighlighter myExecutionPointHighlighter;
private XDebugSessionImpl myLastActiveSession;
private XDebugSessionImpl myActiveSession;
public XDebuggerManagerImpl(final Project project, final StartupManager startupManager, MessageBus messageBus) {
myProject = project;
myBreakpointManager = new XBreakpointManagerImpl(project, this, startupManager);
mySessionData = new LinkedHashMap<ProcessHandler, XDebugSessionData>();
mySessions = new ArrayList<XDebugSessionImpl>();
mySessions = new LinkedHashMap<ProcessHandler, XDebugSessionImpl>();
myExecutionPointHighlighter = new ExecutionPointHighlighter(project);
mySessionTabs = new HashMap<ProcessHandler, XDebugSessionTab>();
messageBus.connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerAdapter() {
@Override
public void fileOpened(final FileEditorManager source, final VirtualFile file) {
@@ -90,14 +87,23 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
messageBus.connect().subscribe(RunContentManagerImpl.RUN_CONTENT_TOPIC, new RunContentWithExecutorListener() {
@Override
public void contentSelected(RunContentDescriptor descriptor, @NotNull Executor executor) {
if (executor.equals(DefaultDebugExecutor.getDebugExecutorInstance())) {
final XDebugSessionImpl session = mySessions.get(descriptor.getProcessHandler());
if (session != null) {
session.activateSession();
}
else {
setActiveSession(null, null, false);
}
}
}
@Override
public void contentRemoved(RunContentDescriptor descriptor, @NotNull Executor executor) {
if (executor.equals(DefaultDebugExecutor.getDebugExecutorInstance())) {
XDebugSessionTab sessionTab = mySessionTabs.remove(descriptor.getProcessHandler());
if (sessionTab != null) {
Disposer.dispose(sessionTab);
XDebugSessionImpl session = mySessions.remove(descriptor.getProcessHandler());
if (session != null) {
Disposer.dispose(session.getSessionTab());
}
}
}
@@ -164,9 +170,8 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
if (oldSessionData == null) {
oldSessionData = new XDebugSessionData();
}
final XDebugSessionTab sessionTab = session.init(process, oldSessionData);
mySessions.add(session);
mySessionTabs.put(session.getDebugProcess().getProcessHandler(), sessionTab);
session.init(process, oldSessionData);
mySessions.put(session.getDebugProcess().getProcessHandler(), session);
return session;
}
@@ -176,15 +181,15 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
XDebugSessionData data = sessionTab.saveData();
mySessions.remove(session);
mySessionData.put(session.getDebugProcess().getProcessHandler(), data);
if (myLastActiveSession == session) {
myLastActiveSession = null;
if (myActiveSession == session) {
myActiveSession = null;
onActiveSessionChanged();
}
}
public void updateExecutionPosition(@NotNull XDebugSessionImpl session, @Nullable XSourcePosition position, boolean useSelection) {
boolean sessionChanged = myLastActiveSession != session;
myLastActiveSession = session;
public void setActiveSession(@Nullable XDebugSessionImpl session, @Nullable XSourcePosition position, boolean useSelection) {
boolean sessionChanged = myActiveSession != session;
myActiveSession = session;
if (position != null) {
myExecutionPointHighlighter.show(position, useSelection);
}
@@ -202,7 +207,8 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
@NotNull
public XDebugSession[] getDebugSessions() {
return mySessions.toArray(new XDebugSession[mySessions.size()]);
final Collection<XDebugSessionImpl> sessions = mySessions.values();
return sessions.toArray(new XDebugSessionImpl[sessions.size()]);
}
@Override
@@ -220,7 +226,7 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
@Override
public <T extends XDebugProcess> Collection<? extends T> getDebugProcesses(Class<T> processClass) {
final List<T> list = new ArrayList<T>();
for (XDebugSessionImpl session : mySessions) {
for (XDebugSessionImpl session : mySessions.values()) {
final XDebugProcess process = session.getDebugProcess();
if (processClass.isInstance(process)) {
list.add(processClass.cast(process));
@@ -231,10 +237,7 @@ public class XDebuggerManagerImpl extends XDebuggerManager implements ProjectCom
@Nullable
public XDebugSessionImpl getCurrentSession() {
if (myLastActiveSession != null) {
return myLastActiveSession;
}
return !mySessions.isEmpty() ? mySessions.get(0) : null;
return myActiveSession;
}
public XDebuggerState getState() {