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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-03-05 15:43:43 +04:00
parent e8003b3b6c 99e7b04dc0
commit 4598b6c46e
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/pydevSrc/com/jetbrains/python/console/pydev/AbstractConsoleCommunication.java
+2 -3
View File
@@ -1,12 +1,11 @@
package com.jetbrains.python.console.pydev;
import com.google.common.collect.Lists;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import java.util.List;
import java.util.Vector;
/**
* @author traff
@@ -23,7 +22,7 @@ public abstract class AbstractConsoleCommunication implements ConsoleCommunicati
*/
public volatile boolean waitingForInput;
private List<ConsoleCommunicationListener> communicationListeners = Lists.newArrayList();
private final List<ConsoleCommunicationListener> communicationListeners = ContainerUtil.createLockFreeCopyOnWriteList();
public AbstractConsoleCommunication(Project project) {
python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+2 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.xdebugger.frame.XValueChildrenList;
import com.jetbrains.python.console.pydev.PydevCompletionVariant;
import com.jetbrains.python.debugger.*;
@@ -51,7 +52,7 @@ public class RemoteDebugger implements ProcessDebugger {
private final TempVarsHolder myTempVars = new TempVarsHolder();
private final List<RemoteDebuggerCloseListener> myCloseListeners = Lists.newArrayList();
private final List<RemoteDebuggerCloseListener> myCloseListeners = ContainerUtil.createLockFreeCopyOnWriteList();
private DebuggerReader myDebuggerReader;
public RemoteDebugger(final IPyDebugProcess debugProcess, final ServerSocket serverSocket, final int timeout) {
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+2 -1
View File
@@ -41,6 +41,7 @@ import com.intellij.psi.impl.source.tree.FileElement;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IJSwingUtilities;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.net.NetUtils;
import com.intellij.util.ui.UIUtil;
import com.jetbrains.django.run.ProcessRunner;
@@ -82,7 +83,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
private PydevConsoleCommunication myPydevConsoleCommunication;
private PyConsoleProcessHandler myProcessHandler;
private PydevConsoleExecuteActionHandler myConsoleExecuteActionHandler;
private List<ConsoleListener> myConsoleListeners = Lists.newArrayList();
private List<ConsoleListener> myConsoleListeners = ContainerUtil.createLockFreeCopyOnWriteList();
private final PyConsoleType myConsoleType;
private Map<String, String> myEnvironmentVariables;
private String myCommandLine;
python/src/com/jetbrains/python/module/PythonModuleBuilderBase.java
+2 -2
View File
@@ -12,19 +12,19 @@ import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.DirectoryProjectGenerator;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PythonModuleTypeBase;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
/**
* @author yole
*/
public class PythonModuleBuilderBase extends ModuleBuilder {
private final List<Runnable> mySdkChangedListeners = new ArrayList<Runnable>();
private final List<Runnable> mySdkChangedListeners = ContainerUtil.createLockFreeCopyOnWriteList();
private final DirectoryProjectGenerator myGenerator;
private Sdk mySdk;
python/src/com/jetbrains/python/packaging/ui/PyPackagesPanel.java
+2 -1
View File
@@ -13,6 +13,7 @@ import com.intellij.ui.DoubleClickListener;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.table.JBTable;
import com.intellij.util.Consumer;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.packaging.*;
import com.jetbrains.python.sdk.flavors.IronPythonSdkFlavor;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
@@ -52,7 +53,7 @@ public class PyPackagesPanel extends JPanel {
private final PyPackagesNotificationPanel myNotificationArea;
private boolean myHasDistribute;
private boolean myHasPip = true;
private final List<Consumer<Sdk>> myPathChangedListeners = new ArrayList<Consumer<Sdk>>();
private final List<Consumer<Sdk>> myPathChangedListeners = ContainerUtil.createLockFreeCopyOnWriteList();
private Set<String> currentlyInstalling = new HashSet<String>();
public PyPackagesPanel(Project project, PyPackagesNotificationPanel area) {