mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-08 08:45:44 +02:00
Code Issues Wiki Activity

Bug 470757 - The console manager doesn't use the secondary id for

Browse source 
opening the view

Use the secondary id the caller passed in if it's not null or '*',
otherwise use the auto generated secondary id.  

Change-Id: I25a884bcb6841cb5fc7e1e6f191800b99e42873a
Signed-off-by: Q.S. Wang <wangqs_eclipse@yahoo.com>
This commit is contained in:
Q.S. Wang 2015-06-23 10:13:09 +10:00
parent 90f8ed75c4
commit 6683690349
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java
View file

@ -237,7 +237,7 @@ public class ConsoleManager {
for (int i = 0; i < refs.length; i++) { for (int i = 0; i < refs.length; i++) {
IViewReference ref = refs[i]; IViewReference ref = refs[i];
if (ref.getId().equals(id)) { if (ref.getId().equals(id)) {
if (secondaryId == ANY_SECONDARY_ID if (ANY_SECONDARY_ID.equals(secondaryId)
|| secondaryId == null && ref.getSecondaryId() == null || secondaryId == null && ref.getSecondaryId() == null
|| secondaryId != null && secondaryId.equals(ref.getSecondaryId())) { || secondaryId != null && secondaryId.equals(ref.getSecondaryId())) {
IViewPart part = ref.getView(true); IViewPart part = ref.getView(true);
@ -362,12 +362,12 @@ public class ConsoleManager {
return notPinnedPart; return notPinnedPart;
} }
// else we need to create a new one // else we need to create a new one
IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getNextTerminalSecondaryId(id != null ? id : IUIConstants.ID)); IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getSecondaryId(secondaryId, id));
return newPart; return newPart;
} }
// we found a active terminal page // we found a active terminal page
// if it is pinned search for a non pinned (not active) // if it is pinned search for a non pinned (not active)
if (((ITerminalsView) activePart).isPinned() && secondaryId == ANY_SECONDARY_ID) { if (((ITerminalsView) activePart).isPinned() && ANY_SECONDARY_ID.equals(secondaryId)) {
// we found one so use it // we found one so use it
IViewPart notPinnedPart = getFirstNotPinnedTerminalsView(id != null ? id : IUIConstants.ID); IViewPart notPinnedPart = getFirstNotPinnedTerminalsView(id != null ? id : IUIConstants.ID);
if (notPinnedPart != null) { if (notPinnedPart != null) {
@ -380,7 +380,7 @@ public class ConsoleManager {
return notPinnedPart; return notPinnedPart;
} }
// else we need to create a new one // else we need to create a new one
IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getNextTerminalSecondaryId(id != null ? id : IUIConstants.ID)); IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getSecondaryId(secondaryId, id));
return newPart; return newPart;
} }
// else return the active one // else return the active one
@ -388,13 +388,27 @@ public class ConsoleManager {
} }
// create first new terminal // create first new terminal
if (activate) { if (activate) {
IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getNextTerminalSecondaryId(id != null ? id : IUIConstants.ID)); IViewPart newPart = showConsoleView(id != null ? id : IUIConstants.ID, getSecondaryId(secondaryId, id));
return newPart; return newPart;
} }
} }
return null; return null;
} }
/**
* Return the secondary id to use.
* @param secondaryId
* @param id
* @return the secondaryId argument is not null, or *, otherwise use the auto generated secondary id.
*/
private String getSecondaryId(String secondaryId, String id){
if(secondaryId==null || ANY_SECONDARY_ID.equals(secondaryId)){
return getNextTerminalSecondaryId(id != null ? id : IUIConstants.ID);
}
return secondaryId;
}
/** /**
* Opens the console with the given title and connector. * Opens the console with the given title and connector.
* <p> * <p>