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

some more cleanups

Browse Source
This commit is contained in:
Anton Makeev
2007-06-22 11:19:34 +04:00
parent 0683dd0e2a
commit d45e5fb8c7
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/impl/com/intellij/compiler/actions/CompileProjectAction.java
+4 -4
View File
@@ -1,5 +1,6 @@
package com.intellij.compiler.actions;
import com.intellij.localvcs.integration.LocalHistory;
import com.intellij.localvcs.integration.LocalHistoryConfiguration;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataConstants;
@@ -9,7 +10,6 @@ import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompileStatusNotification;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.localVcs.LocalVcs;
import com.intellij.openapi.project.Project;
import com.intellij.util.ProfilingUtil;
@@ -21,9 +21,9 @@ public class CompileProjectAction extends CompileActionBase {
public void finished(boolean aborted, int errors, int warnings, final CompileContext compileContext) {
if (!aborted && LocalHistoryConfiguration.getInstance().ADD_LABEL_ON_PROJECT_COMPILATION) {
String text = getTemplatePresentation().getText();
LocalVcs.getInstance(project).addLabel(errors == 0
? CompilerBundle.message("rebuild.lvcs.label.no.errors", text)
: CompilerBundle.message("rebuild.lvcs.label.with.errors", text), "");
LocalHistory.putLabel(project, errors == 0
? CompilerBundle.message("rebuild.lvcs.label.no.errors", text)
: CompilerBundle.message("rebuild.lvcs.label.with.errors", text));
}
}
});
debugger/impl/com/intellij/debugger/impl/GenericDebuggerRunner.java
+8 -9
View File
@@ -9,10 +9,10 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.JavaProgramRunner;
import com.intellij.execution.runners.RunnerInfo;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.localvcs.integration.LocalHistory;
import com.intellij.localvcs.integration.LocalHistoryConfiguration;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.localVcs.LocalVcs;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.IconLoader;
@@ -53,16 +53,15 @@ public class GenericDebuggerRunner implements JavaProgramRunner<GenericDebuggerR
final RunProfile runProfile,
RunContentDescriptor reuseContent,
final Project project) throws ExecutionException {
final boolean addLvcsLabel = LocalHistoryConfiguration.getInstance().ADD_LABEL_ON_RUNNING;
final LocalVcs localVcs = LocalVcs.getInstance(project);
final boolean addHistoryLabel = LocalHistoryConfiguration.getInstance().ADD_LABEL_ON_RUNNING;
RunContentDescriptor contentDescriptor = null;
final DebuggerPanelsManager manager = DebuggerPanelsManager.getInstance(project);
if (state instanceof JavaCommandLine) {
FileDocumentManager.getInstance().saveAllDocuments();
final JavaCommandLine javaCommandLine = (JavaCommandLine)state;
if (addLvcsLabel) {
localVcs.addLabel(DebuggerBundle.message("debugger.runner.vcs.label.debugging", runProfile.getName()), "");
if (addHistoryLabel) {
LocalHistory.putLabel(project, DebuggerBundle.message("debugger.runner.vcs.label.debugging", runProfile.getName()), "");
}
RemoteConnection connection = DebuggerManagerImpl
.createDebugParameters(javaCommandLine.getJavaParameters(), true, DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, "", false);
@@ -70,16 +69,16 @@ public class GenericDebuggerRunner implements JavaProgramRunner<GenericDebuggerR
}
else if (state instanceof PatchedRunnableState) {
FileDocumentManager.getInstance().saveAllDocuments();
if (addLvcsLabel) {
localVcs.addLabel(DebuggerBundle.message("debugger.runner.vcs.label.debugging", runProfile.getName()), "");
if (addHistoryLabel) {
LocalHistory.putLabel(project, DebuggerBundle.message("debugger.runner.vcs.label.debugging", runProfile.getName()), "");
}
final RemoteConnection connection = doPatch(new JavaParameters(), state.getRunnerSettings());
contentDescriptor = manager.attachVirtualMachine(runProfile, this, state, reuseContent, connection, true);
}
else if (state instanceof RemoteState) {
FileDocumentManager.getInstance().saveAllDocuments();
if (addLvcsLabel) {
localVcs.addLabel(DebuggerBundle.message("debugger.runner.vcs.label.remote.debug", runProfile.getName()), "");
if (addHistoryLabel) {
LocalHistory.putLabel(project, DebuggerBundle.message("debugger.runner.vcs.label.remote.debug", runProfile.getName()), "");
}
RemoteState remoteState = (RemoteState)state;
final RemoteConnection connection = createRemoteDebugConnection(remoteState, state.getRunnerSettings());