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

Make DESCRIPTOR_KEY public for plugin writers

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2016-12-21 22:39:00 +03:00
parent 2a1beaad22
commit 9636fedb0c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
+3
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Key;
import com.intellij.ui.content.Content;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -31,6 +32,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public class RunContentDescriptor implements Disposable {
// Should be used in com.intellij.ui.content.Content
public static final Key<RunContentDescriptor> DESCRIPTOR_KEY = Key.create("Descriptor");
private ExecutionConsole myExecutionConsole;
private ProcessHandler myProcessHandler;
private JComponent myComponent;
platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+4 -5
View File
@@ -63,7 +63,6 @@ import java.util.*;
public class RunContentManagerImpl implements RunContentManager, Disposable {
public static final Key<Boolean> ALWAYS_USE_DEFAULT_STOPPING_BEHAVIOUR_KEY = Key.create("ALWAYS_USE_DEFAULT_STOPPING_BEHAVIOUR_KEY");
private static final Logger LOG = Logger.getInstance(RunContentManagerImpl.class);
private static final Key<RunContentDescriptor> DESCRIPTOR_KEY = Key.create("Descriptor");
private final Project myProject;
private final Map<String, ContentManager> myToolwindowIdToContentManagerMap = new THashMap<>();
@@ -272,7 +271,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
content.setExecutionId(executionId);
content.setComponent(descriptor.getComponent());
content.setPreferredFocusedComponent(descriptor.getPreferredFocusComputable());
content.putUserData(DESCRIPTOR_KEY, descriptor);
content.putUserData(RunContentDescriptor.DESCRIPTOR_KEY, descriptor);
final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(executor.getToolWindowId());
final ProcessHandler processHandler = descriptor.getProcessHandler();
if (processHandler != null) {
@@ -456,7 +455,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
private Content createNewContent(final ContentManager contentManager, final RunContentDescriptor descriptor, Executor executor) {
final String processDisplayName = descriptor.getDisplayName();
final Content content = ContentFactory.SERVICE.getInstance().createContent(descriptor.getComponent(), processDisplayName, true);
content.putUserData(DESCRIPTOR_KEY, descriptor);
content.putUserData(RunContentDescriptor.DESCRIPTOR_KEY, descriptor);
content.putUserData(ToolWindow.SHOW_CONTENT_ICON, Boolean.TRUE);
contentManager.addContent(content);
new CloseListener(content, executor);
@@ -471,7 +470,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
@Nullable
private static RunContentDescriptor getRunContentDescriptorByContent(@NotNull Content content) {
return content.getUserData(DESCRIPTOR_KEY);
return content.getUserData(RunContentDescriptor.DESCRIPTOR_KEY);
}
@Override
@@ -488,7 +487,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
@Nullable
private static Content getRunContentByDescriptor(@NotNull ContentManager contentManager, @NotNull RunContentDescriptor descriptor) {
for (Content content : contentManager.getContents()) {
if (descriptor.equals(content.getUserData(DESCRIPTOR_KEY))) {
if (descriptor.equals(content.getUserData(RunContentDescriptor.DESCRIPTOR_KEY))) {
return content;
}
}