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:
Kirill Likhodedov
2012-02-02 18:01:35 +04:00
parent e884d241c9 536832f507
commit 345481fd2d
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+16 -13
View File
@@ -1433,11 +1433,12 @@ public class Mappings {
debug("Dependent file: ", depFile);
final Collection<UsageRepr.Cluster> depClusters = mySourceFileToUsages.get(depFile);
for (UsageRepr.Cluster depCluster : depClusters) {
final Set<UsageRepr.Usage> depUsages = depCluster.getUsages();
if (depUsages != null) {
if (depClusters != null) {
for (UsageRepr.Cluster depCluster : depClusters) {
final Set<UsageRepr.Usage> depUsages = depCluster.getUsages();
if (depUsages == null) {
continue;
}
final Set<UsageRepr.Usage> usages = new HashSet<UsageRepr.Usage>(depUsages);
usages.retainAll(affectedUsages);
@@ -1512,15 +1513,17 @@ public class Mappings {
myClassToSubclasses.removeFrom(superSomething, cr.name);
}
for (UsageRepr.Cluster cluster : clusters) {
final Set<UsageRepr.Usage> usages = cluster.getUsages();
if (usages != null) {
for (UsageRepr.Usage u : usages) {
if (u instanceof UsageRepr.ClassUsage) {
final Set<DependencyContext.S> residents = cluster.getResidence(u);
if (clusters != null) {
for (UsageRepr.Cluster cluster : clusters) {
final Set<UsageRepr.Usage> usages = cluster.getUsages();
if (usages != null) {
for (UsageRepr.Usage u : usages) {
if (u instanceof UsageRepr.ClassUsage) {
final Set<DependencyContext.S> residents = cluster.getResidence(u);
if (residents != null && residents.contains(cr.name)) {
myClassToClassDependency.removeFrom(((UsageRepr.ClassUsage)u).className, cr.name);
if (residents != null && residents.contains(cr.name)) {
myClassToClassDependency.removeFrom(((UsageRepr.ClassUsage)u).className, cr.name);
}
}
}
}
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+21
View File
@@ -695,6 +695,27 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
return (ActionGroup)myActionManager.getAction(SETTINGS);
}
public ContentManager getContentManager(Content content) {
if (hasContent(myManager, content)) {
return myManager;
}
for (RunnerContentUi child : myChildren) {
if (hasContent(child.myManager, content)) {
return child.myManager;
}
}
return myManager;
}
private static boolean hasContent(ContentManager manager, Content content) {
for (Content c : manager.getContents()) {
if (c == content) {
return true;
}
}
return false;
}
private static void moveFollowingTabs(int index, final JBRunnerTabs tabs) {
for (TabInfo info : tabs.getTabs()) {
final TabImpl tab = getTabFor(info);
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class RunnerLayout {
}
public boolean isToolbarHorizontal() {
return myGeneral.horizontalToolbar;
return false;
}
public void setToolbarHorizontal(boolean horizontal) {
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
+5 -1
View File
@@ -169,7 +169,11 @@ public class RunnerLayoutUiImpl implements Disposable, RunnerLayoutUi, LayoutSta
public ActionCallback selectAndFocus(@Nullable final Content content, boolean requestFocus, final boolean forced, boolean implicit) {
if (content == null) return new ActionCallback.Rejected();
return getContentManager().setSelectedContent(content, requestFocus || shouldRequestFocus(), forced, implicit);
return getContentManager(content).setSelectedContent(content, requestFocus || shouldRequestFocus(), forced, implicit);
}
private ContentManager getContentManager(@NotNull Content content) {
return myContentUI.getContentManager(content);
}
private boolean shouldRequestFocus() {