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

refactoring: rename own_thread -> pooled_thread, single_thread -> own_thread

Browse Source
This commit is contained in:
Eugene Kudelevsky
2013-01-14 18:33:57 +04:00
parent 417706d97e
commit c03f359225
20 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
}
};
myActionManagerEx.addAnActionListener(actionListener, project);
myUpdateDocAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD,myProject);
myUpdateDocAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD,myProject);
}
private void closeDocHint() {
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
});
myFileEditorManager = fileEditorManager;
myDocumentationManager = documentationManager;
myDocAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, myProject);
myDocAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, myProject);
}
@Override
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
+1 -1
View File
@@ -582,7 +582,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
private class ReaderThread implements Runnable {
private BufferedReader myReader;
private boolean myRunning = false;
private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, LogConsoleBase.this);
private Alarm myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, LogConsoleBase.this);
public ReaderThread(@Nullable Reader reader) {
myReader = reader != null ? new BufferedReader(reader) : null;
platform/lang-impl/src/com/intellij/diagnostic/logging/LogFilesManager.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class LogFilesManager implements Disposable {
private final Map<LogFileOptions, RunConfigurationBase> myLogFileToConfiguration = new HashMap<LogFileOptions, RunConfigurationBase>();
private final Runnable myUpdateRequest;
private final LogConsoleManager myManager;
private final Alarm myUpdateAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, this);
private final Alarm myUpdateAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, this);
private boolean myDisposed;
public LogFilesManager(final Project project, LogConsoleManager manager, Disposable parentDisposable) {
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
private String myHelpId;
private final Alarm myFlushUserInputAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, this);
private final Alarm myFlushUserInputAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, this);
private final Alarm myFlushAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD, this);
private final Set<MyFlushRunnable> myCurrentRequests = new HashSet<MyFlushRunnable>();
platform/platform-api/src/com/intellij/util/Alarm.java
+8 -8
View File
@@ -61,10 +61,10 @@ public class Alarm implements Disposable {
myDisposed = true;
cancelAllRequests();
if (myThreadToUse == ThreadToUse.OWN_THREAD) {
if (myThreadToUse == ThreadToUse.POOLED_THREAD) {
myExecutorService.shutdown();
}
else if (myThreadToUse == ThreadToUse.SINGLE_THREAD) {
else if (myThreadToUse == ThreadToUse.OWN_THREAD) {
((ThreadPoolExecutor)myExecutorService).getQueue().clear();
myExecutorService.shutdown();
}
@@ -73,8 +73,8 @@ public class Alarm implements Disposable {
public enum ThreadToUse {
SWING_THREAD,
SHARED_THREAD,
OWN_THREAD,
SINGLE_THREAD
POOLED_THREAD,
OWN_THREAD
}
/**
@@ -90,17 +90,17 @@ public class Alarm implements Disposable {
public Alarm(@NotNull ThreadToUse threadToUse) {
this(threadToUse, null);
LOG.assertTrue(threadToUse != ThreadToUse.OWN_THREAD && threadToUse != ThreadToUse.SINGLE_THREAD,
"You must provide parent Disposable for ThreadToUse.OWN_THREAD and ThreadToUse.SINGLE_THREAD Alarm");
LOG.assertTrue(threadToUse != ThreadToUse.POOLED_THREAD && threadToUse != ThreadToUse.OWN_THREAD,
"You must provide parent Disposable for ThreadToUse.POOLED_THREAD and ThreadToUse.OWN_THREAD Alarm");
}
public Alarm(@NotNull ThreadToUse threadToUse, Disposable parentDisposable) {
myThreadToUse = threadToUse;
if (threadToUse == ThreadToUse.OWN_THREAD) {
if (threadToUse == ThreadToUse.POOLED_THREAD) {
myExecutorService = new MyExecutor();
}
else if(threadToUse == ThreadToUse.SINGLE_THREAD) {
else if(threadToUse == ThreadToUse.OWN_THREAD) {
myExecutorService = ConcurrencyUtil.newSingleThreadExecutor(
"Alarm pool(own)", Thread.NORM_PRIORITY - 2);
}
platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable {
@Nullable JComponent activationComponent,
boolean executeInDispatchThread) {
this(name, mergingTimeSpan, isActive, modalityStateComponent, parent, activationComponent,
executeInDispatchThread ? Alarm.ThreadToUse.SWING_THREAD : Alarm.ThreadToUse.OWN_THREAD);
executeInDispatchThread ? Alarm.ThreadToUse.SWING_THREAD : Alarm.ThreadToUse.POOLED_THREAD);
}
public MergingUpdateQueue(@NonNls String name,
platform/platform-impl/src/com/intellij/internal/statistic/updater/SendStatisticsProjectComponent.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class SendStatisticsProjectComponent implements ProjectComponent {
public SendStatisticsProjectComponent(Project project) {
myProject = project;
myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, myProject);
myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, myProject);
NotificationsConfigurationImpl.remove("SendUsagesStatistics");
NotificationsConfiguration.getNotificationsConfiguration().register(
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class EncodingManagerImpl extends EncodingManager implements PersistentSt
private final PropertyChangeSupport myPropertyChangeSupport = new PropertyChangeSupport(this);
private Charset myDefaultEncoding = CharsetToolkit.UTF8_CHARSET;
private final Alarm updateEncodingFromContent = new Alarm(Alarm.ThreadToUse.OWN_THREAD, this);
private final Alarm updateEncodingFromContent = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, this);
private static final Key<Charset> CACHED_CHARSET_FROM_CONTENT = Key.create("CACHED_CHARSET_FROM_CONTENT");
private final TransferToPooledThreadQueue<Reference<Document>> myChangedDocuments = new TransferToPooledThreadQueue<Reference<Document>>(
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
myWatcher.startup(myNotifier);
assertTrue(myWatcher.isOperational());
myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, getProject());
myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, getProject());
myTimeout = NATIVE_PROCESS_DELAY;
myConnection = ApplicationManager.getApplication().getMessageBus().connect();
platform/vcs-impl/src/com/intellij/openapi/vcs/ZipperUpdater.java
+2 -2
View File
@@ -33,8 +33,8 @@ public class ZipperUpdater {
public ZipperUpdater(final int delay, Disposable parentDisposable) {
myDelay = delay;
myIsEmpty = true;
myThreadToUse = Alarm.ThreadToUse.OWN_THREAD;
myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, parentDisposable);
myThreadToUse = Alarm.ThreadToUse.POOLED_THREAD;
myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, parentDisposable);
}
public ZipperUpdater(final int delay, final Alarm.ThreadToUse threadToUse, Disposable parentDisposable) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ControlledCycle.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ControlledCycle {
}
}
};
mySimpleAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, project);
mySimpleAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, project);
}
public boolean startIfNotStarted(final int refreshInterval) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsAnnotationLocalChangesListenerImpl.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class VcsAnnotationLocalChangesListenerImpl implements Disposable, VcsAnn
myProject = project;
myLock = new Object();
myUpdateStuff = createUpdateStuff();
myUpdater = new ZipperUpdater(ApplicationManager.getApplication().isUnitTestMode() ? 10 : 300, Alarm.ThreadToUse.OWN_THREAD, project);
myUpdater = new ZipperUpdater(ApplicationManager.getApplication().isUnitTestMode() ? 10 : 300, Alarm.ThreadToUse.POOLED_THREAD, project);
myConnection = myProject.getMessageBus().connect();
myLocalFileSystem = LocalFileSystem.getInstance();
myHandler = createHandler();
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeVfsListener.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class VcsDirtyScopeVfsListener implements ApplicationComponent, BulkFileL
new FileAndDirsCollector().markDirty(map);
}
};
myZipperUpdater = new ConstantZipperUpdater(300, Alarm.ThreadToUse.OWN_THREAD, ApplicationManager.getApplication(),
myZipperUpdater = new ConstantZipperUpdater(300, Alarm.ThreadToUse.POOLED_THREAD, ApplicationManager.getApplication(),
myDirtReporter);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
}
});
myLoadQueue = new ZipperUpdater(500, Alarm.ThreadToUse.OWN_THREAD, getDisposable());
myLoadQueue = new ZipperUpdater(500, Alarm.ThreadToUse.POOLED_THREAD, getDisposable());
myCanChangePatchFile = applyPatchMode.isCanChangePatchFile();
myReset = myCanChangePatchFile ? new Runnable() {
public void run() {
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+1 -1
View File
@@ -376,7 +376,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
replaceTransferable();
myUpdateAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, myProject);
myUpdateAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, myProject);
final HistoryAsTreeProvider treeHistoryProvider = myHistorySession.getHistoryAsTreeProvider();
plugins/git4idea/src/git4idea/roots/GitRootScanner.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class GitRootScanner implements BulkFileListener, ModuleRootListener, Dis
messageBus.connect().subscribe(VirtualFileManager.VFS_CHANGES, this);
messageBus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, this);
myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, project);
myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, project);
}
@Override
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class MavenArtifactSearchPanel extends JPanel {
myListener = listener;
initComponents(initialText);
myAlarm = new Alarm(Alarm.ThreadToUse.OWN_THREAD, dialog.getDisposable());
myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, dialog.getDisposable());
}
public JTextField getSearchField() {
plugins/svn4idea/src/org/jetbrains/idea/svn/RootsToWorkingCopies.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class RootsToWorkingCopies implements VcsListener {
}
}
};
myZipperUpdater = new ZipperUpdater(200, Alarm.ThreadToUse.OWN_THREAD, myProject);
myZipperUpdater = new ZipperUpdater(200, Alarm.ThreadToUse.POOLED_THREAD, myProject);
}
private void addRoot(final VirtualFile root) {
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/EDTGuard.java
+1 -1
View File
@@ -208,7 +208,7 @@ class EDTGuard implements InvocationHandler {
});
final Alarm alarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, d);
final Alarm alarm2 = new Alarm(Alarm.ThreadToUse.OWN_THREAD, alarm);
final Alarm alarm2 = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, alarm);
final Runnable watchdog = new Runnable() {
@Override