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

integrate hotswap with automake mode

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-01-30 21:54:56 +01:00
parent b011fdce4a
commit f1d0501511
7 changed files with 134 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerAdapter.java
+38
View File
@@ -0,0 +1,38 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.debugger.impl;
/**
* @author Eugene Zhuravlev
* Date: 1/30/12
*/
public class DebuggerManagerAdapter implements DebuggerManagerListener{
@Override
public void sessionCreated(DebuggerSession session) {
}
@Override
public void sessionAttached(DebuggerSession session) {
}
@Override
public void sessionDetached(DebuggerSession session) {
}
@Override
public void sessionRemoved(DebuggerSession session) {
}
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+7 -2
View File
@@ -88,8 +88,13 @@ public class DebuggerManagerImpl extends DebuggerManagerEx {
if(myDebuggerStateManager.myDebuggerSession == session) {
myDebuggerStateManager.fireStateChanged(newContext, event);
}
if(event == DebuggerSession.EVENT_DISPOSE) {
if (event == DebuggerSession.EVENT_ATTACHED) {
myDispatcher.getMulticaster().sessionAttached(session);
}
else if (event == DebuggerSession.EVENT_DETACHED) {
myDispatcher.getMulticaster().sessionDetached(session);
}
else if(event == DebuggerSession.EVENT_DISPOSE) {
dispose(session);
if(myDebuggerStateManager.myDebuggerSession == session) {
myDebuggerStateManager.setState(DebuggerContextImpl.EMPTY_CONTEXT, DebuggerSession.STATE_DISPOSED, DebuggerSession.EVENT_DISPOSE, null);
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerListener.java
+2 -2
View File
@@ -15,11 +15,11 @@
*/
package com.intellij.debugger.impl;
import com.intellij.debugger.impl.DebuggerSession;
import java.util.EventListener;
public interface DebuggerManagerListener extends EventListener{
void sessionCreated(DebuggerSession session);
void sessionAttached(DebuggerSession session);
void sessionDetached(DebuggerSession session);
void sessionRemoved(DebuggerSession session);
}
java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class HotSwapManager extends AbstractProjectComponent {
public HotSwapManager(Project project, DebuggerManagerEx manager) {
super(project);
manager.addDebuggerManagerListener(new DebuggerManagerListener() {
manager.addDebuggerManagerListener(new DebuggerManagerAdapter() {
public void sessionCreated(DebuggerSession session) {
myTimeStamps.put(session, Long.valueOf(System.currentTimeMillis()));
}
java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java
+65 -36
View File
@@ -18,7 +18,9 @@ package com.intellij.debugger.ui;
import com.intellij.CommonBundle;
import com.intellij.compiler.CompilerWorkspaceConfiguration;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.DebuggerManager;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.impl.DebuggerManagerAdapter;
import com.intellij.debugger.impl.DebuggerSession;
import com.intellij.debugger.impl.HotSwapFile;
import com.intellij.debugger.impl.HotSwapManager;
@@ -36,11 +38,13 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.util.PairFunction;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -59,47 +63,31 @@ public class HotSwapUIImpl extends HotSwapUI implements ProjectComponent{
private final Project myProject;
private boolean myPerformHotswapAfterThisCompilation = true;
public HotSwapUIImpl(final Project project, MessageBus bus) {
public HotSwapUIImpl(final Project project, final MessageBus bus, DebuggerManager debugManager) {
myProject = project;
bus.connect().subscribe(CompilerTopics.COMPILATION_STATUS, new CompilationStatusListener() {
private final AtomicReference<Map<String, List<String>>> myGeneratedPaths = new AtomicReference<Map<String, List<String>>>(new HashMap<String, List<String>>());
((DebuggerManagerEx)debugManager).addDebuggerManagerListener(new DebuggerManagerAdapter() {
private MessageBusConnection myConn = null;
private int mySessionCount = 0;
public void fileGenerated(String outputRoot, String relativePath) {
final Map<String, List<String>> map = myGeneratedPaths.get();
List<String> paths = map.get(outputRoot);
if (paths == null) {
paths = new ArrayList<String>();
map.put(outputRoot, paths);
@Override
public void sessionAttached(DebuggerSession session) {
if (mySessionCount++ == 0) {
myConn = bus.connect();
myConn.subscribe(CompilerTopics.COMPILATION_STATUS, new MyCompilationStatusListener());
}
paths.add(relativePath);
}
public void compilationFinished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
final Map<String, List<String>> generated = myGeneratedPaths.getAndSet(new HashMap<String, List<String>>());
if (myProject.isDisposed()) {
return;
}
if (errors == 0 && !aborted && myPerformHotswapAfterThisCompilation) {
for (HotSwapVetoableListener listener : myListeners) {
if (!listener.shouldHotSwap(compileContext)) {
return;
}
}
final List<DebuggerSession> sessions = new ArrayList<DebuggerSession>();
Collection<DebuggerSession> debuggerSessions = DebuggerManagerEx.getInstanceEx(myProject).getSessions();
for (final DebuggerSession debuggerSession : debuggerSessions) {
if (debuggerSession.isAttached() && debuggerSession.getProcess().canRedefineClasses()) {
sessions.add(debuggerSession);
}
}
if (!sessions.isEmpty()) {
hotSwapSessions(sessions, generated);
@Override
public void sessionDetached(DebuggerSession session) {
mySessionCount = Math.max(0, mySessionCount - 1);
if (mySessionCount == 0) {
final MessageBusConnection conn = myConn;
if (conn != null) {
Disposer.dispose(conn);
myConn = null;
}
}
myPerformHotswapAfterThisCompilation = true;
}
});
}
@@ -253,9 +241,7 @@ public class HotSwapUIImpl extends HotSwapUI implements ProjectComponent{
}
else {
if(session.isAttached()) {
final List<DebuggerSession> sessions = new ArrayList<DebuggerSession>(1);
sessions.add(session);
hotSwapSessions(sessions, null);
hotSwapSessions(Collections.singletonList(session), null);
}
}
}
@@ -267,4 +253,47 @@ public class HotSwapUIImpl extends HotSwapUI implements ProjectComponent{
public void dontAskHotswapAfterThisCompilation() {
myAskBeforeHotswap = false;
}
private class MyCompilationStatusListener implements CompilationStatusListener {
private final AtomicReference<Map<String, List<String>>>
myGeneratedPaths = new AtomicReference<Map<String, List<String>>>(new HashMap<String, List<String>>());
public void fileGenerated(String outputRoot, String relativePath) {
final Map<String, List<String>> map = myGeneratedPaths.get();
List<String> paths = map.get(outputRoot);
if (paths == null) {
paths = new ArrayList<String>();
map.put(outputRoot, paths);
}
paths.add(relativePath);
}
public void compilationFinished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
final Map<String, List<String>> generated = myGeneratedPaths.getAndSet(new HashMap<String, List<String>>());
if (myProject.isDisposed()) {
return;
}
if (errors == 0 && !aborted && myPerformHotswapAfterThisCompilation) {
for (HotSwapVetoableListener listener : myListeners) {
if (!listener.shouldHotSwap(compileContext)) {
return;
}
}
final List<DebuggerSession> sessions = new ArrayList<DebuggerSession>();
Collection<DebuggerSession> debuggerSessions = DebuggerManagerEx.getInstanceEx(myProject).getSessions();
for (final DebuggerSession debuggerSession : debuggerSessions) {
if (debuggerSession.isAttached() && debuggerSession.getProcess().canRedefineClasses()) {
sessions.add(debuggerSession);
}
}
if (!sessions.isEmpty()) {
hotSwapSessions(sessions, generated);
}
}
myPerformHotswapAfterThisCompilation = true;
}
}
}