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

[186769] Add comments about how to add RSE preference page actions

Browse source
This commit is contained in:
Martin Oberhuber 2008-07-24 13:27:08 +00:00
parent 0e39dbbba8
commit 6b7f927b68
5 changed files with 165 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rse/plugins/org.eclipse.rse.ui/HelpContexts.xml
View file

@ -112,6 +112,7 @@ Select the configuration to be used for this subsystem and then edit the propert
<description>Set as the default user ID for a given system type when creating a new connection, or change it for existing connections that inherit the user ID.</description> <description>Set as the default user ID for a given system type when creating a new connection, or change it for existing connections that inherit the user ID.</description>
</context> </context>
<!-- PULLDOWN ACTION: Preferences cascading action... --> <!-- PULLDOWN ACTION: Preferences cascading action... -->
<!-- FIXME this one is OBSOLETE, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769 -->
<context id="actnpref"> <context id="actnpref">
<description>Go directly to a preference page. Saves drilling down via Windows->Preferences.</description> <description>Go directly to a preference page. Saves drilling down via Windows->Preferences.</description>
</context> </context>

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java
View file

@ -733,6 +733,7 @@ public class SystemResources extends NLS
public static String ACTION_CASCADING_VIEW_TOOLTIP; public static String ACTION_CASCADING_VIEW_TOOLTIP;
public static String ACTION_CASCADING_PREFERENCES_LABEL; public static String ACTION_CASCADING_PREFERENCES_LABEL;
//FIXME This one is OBSOLETE with https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769
public static String ACTION_CASCADING_PREFERENCES_TOOLTIP; public static String ACTION_CASCADING_PREFERENCES_TOOLTIP;
public static String ACTION_CASCADING_PULLDOWN_LABEL; public static String ACTION_CASCADING_PULLDOWN_LABEL;

79
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java
View file

@ -1,15 +1,15 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved. * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Initial Contributors: * Initial Contributors:
* The following IBM employees contributed to the Remote System Explorer * The following IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir, * component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point * Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActions extension point
* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences * Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences
@ -38,15 +38,14 @@ import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog;
* child pages registered under that page ("category"). * child pages registered under that page ("category").
* <p> * <p>
* @deprecated this will be moved to use the command/handler extension point. * @deprecated this will be moved to use the command/handler extension point.
* @see SystemCascadingPreferencesAction
*/ */
public class SystemShowPreferencesPageAction extends SystemBaseAction implements IViewActionDelegate public class SystemShowPreferencesPageAction extends SystemBaseAction implements IViewActionDelegate
{ {
private PreferenceManager preferenceManager; private PreferenceManager preferenceManager;
private String[] preferencePageIDs; private String[] preferencePageIDs;
private String preferencePageCategory; private String preferencePageCategory;
/** /**
* Constructor. * Constructor.
* We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()} * We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()}
@ -56,7 +55,7 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
{ {
super("temp label", null); //$NON-NLS-1$ super("temp label", null); //$NON-NLS-1$
} }
/** /**
* Set ID of the preference root page to show. * Set ID of the preference root page to show.
* @param preferencePageID The ID of the preference page root to show. All child nodes will also be shown. * @param preferencePageID The ID of the preference page root to show. All child nodes will also be shown.
@ -71,25 +70,25 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
*/ */
public void setPreferencePageID(String[] preferencePageIDs) public void setPreferencePageID(String[] preferencePageIDs)
{ {
allowOnMultipleSelection(false); allowOnMultipleSelection(false);
setSelectionSensitive(false); setSelectionSensitive(false);
this.preferencePageIDs = preferencePageIDs; this.preferencePageIDs = preferencePageIDs;
} }
/** /**
* Set the category of the pages to be shown. This only needs to be called * Set the category of the pages to be shown. This only needs to be called
* for non-root pages. Note that the ID to give here is not of the immediate * for non-root pages. Note that the ID to give here is not of the immediate
* parent, but that of the root parent. It tells us which root subtree to * parent, but that of the root parent. It tells us which root subtree to
* search for the given page(s). * search for the given page(s).
*/ */
public void setPreferencePageCategory(String preferencePageCategory) public void setPreferencePageCategory(String preferencePageCategory)
{ {
this.preferencePageCategory = preferencePageCategory; this.preferencePageCategory = preferencePageCategory;
} }
/** /**
* @see IViewActionDelegate#init(IViewPart) * @see IViewActionDelegate#init(IViewPart)
*/ */
public void init(IViewPart view) public void init(IViewPart view)
{ {
setShell(view.getSite().getShell()); setShell(view.getSite().getShell());
} }
@ -99,7 +98,7 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
/** /**
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/ */
public void run(IAction action) public void run(IAction action)
{ {
run(); run();
} }
@ -107,15 +106,15 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
/** /**
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
*/ */
public void selectionChanged(IAction action, ISelection selection) public void selectionChanged(IAction action, ISelection selection)
{ {
} }
/** /**
* This is the method called when the user selects this action. * This is the method called when the user selects this action.
* @see org.eclipse.jface.action.Action#run() * @see org.eclipse.jface.action.Action#run()
*/ */
public void run() public void run()
{ {
// Bring up the preferences page // Bring up the preferences page
/* /*
@ -125,25 +124,25 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
dialog.open(); dialog.open();
*/ */
PreferenceManager pm = getPreferenceManager(); PreferenceManager pm = getPreferenceManager();
if (pm != null) if (pm != null)
{ {
shell = RSEUIPlugin.getTheSystemRegistryUI().getShell(); shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm); PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm);
d.create(); d.create();
// TODO - hack to make this work in 3.1 // TODO - hack to make this work in 3.1
String id = PlatformUI.PLUGIN_ID + ".preference_dialog_context"; //$NON-NLS-1$ String id = PlatformUI.PLUGIN_ID + ".preference_dialog_context"; //$NON-NLS-1$
PlatformUI.getWorkbench().getHelpSystem().setHelp(d.getShell(), id); PlatformUI.getWorkbench().getHelpSystem().setHelp(d.getShell(), id);
d.open(); d.open();
} }
} }
/* /*
* Get the preference manager. * Get the preference manager.
*/ */
public PreferenceManager getPreferenceManager() public PreferenceManager getPreferenceManager()
{ {
if (preferenceManager == null) if (preferenceManager == null)
{ {
preferenceManager = new PreferenceManager('/'); preferenceManager = new PreferenceManager('/');
@ -151,16 +150,16 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
//PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(PlatformUI.getWorkbench()); //PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(PlatformUI.getWorkbench());
//List pageContributions = registryReader.getPreferenceContributions(Platform.getExtensionRegistry()); //List pageContributions = registryReader.getPreferenceContributions(Platform.getExtensionRegistry());
PreferenceManager workbenchMgr = PlatformUI.getWorkbench().getPreferenceManager(); PreferenceManager workbenchMgr = PlatformUI.getWorkbench().getPreferenceManager();
List pageContributions = workbenchMgr.getElements(PreferenceManager.POST_ORDER); List pageContributions = workbenchMgr.getElements(PreferenceManager.POST_ORDER);
//Add the contributions to the manager //Add the contributions to the manager
Iterator iter = pageContributions.iterator(); Iterator iter = pageContributions.iterator();
while (iter.hasNext()) while (iter.hasNext())
{ {
IPreferenceNode prefNode = (IPreferenceNode) iter.next(); IPreferenceNode prefNode = (IPreferenceNode) iter.next();
//System.out.println("prefNode.getId() == "+prefNode.getId()); //System.out.println("prefNode.getId() == "+prefNode.getId());
@ -176,16 +175,16 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
//System.out.println("Made it here"); //System.out.println("Made it here");
prefNode = searchForSubPage(prefNode, prefNodeID); prefNode = searchForSubPage(prefNode, prefNodeID);
if (prefNode != null) if (prefNode != null)
match = true; match = true;
} }
if (match) if (match)
preferenceManager.addToRoot(prefNode); preferenceManager.addToRoot(prefNode);
} }
} }
return preferenceManager; return preferenceManager;
} }
private IPreferenceNode searchForSubPage(IPreferenceNode parent, String prefNodeID) private IPreferenceNode searchForSubPage(IPreferenceNode parent, String prefNodeID)
{ {
IPreferenceNode match = null; IPreferenceNode match = null;
@ -196,18 +195,18 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements
{ {
if (testForMatch(subNodes[idx].getId())) if (testForMatch(subNodes[idx].getId()))
match = subNodes[idx]; match = subNodes[idx];
else else
match = searchForSubPage(subNodes[idx], prefNodeID); match = searchForSubPage(subNodes[idx], prefNodeID);
} }
return match; return match;
} }
private boolean testForMatch(String prefNodeID) private boolean testForMatch(String prefNodeID)
{ {
boolean match = false; boolean match = false;
for (int idx=0; !match && (idx<preferencePageIDs.length); idx++) for (int idx=0; !match && (idx<preferencePageIDs.length); idx++)
{ {
if (prefNodeID.equals(preferencePageIDs[idx])) if (prefNodeID.equals(preferencePageIDs[idx]))
match = true; match = true;
} }

236
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -7,10 +7,10 @@
* *
* Initial Contributors: * Initial Contributors:
* The following IBM employees contributed to the Remote System Explorer * The following IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir, * component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* Kevin Doyle (IBM) - [180875] - Added double click listener that handles opening of files * Kevin Doyle (IBM) - [180875] - Added double click listener that handles opening of files
* David Dykstal (IBM) - moved SystemPreferencesManager to a new package * David Dykstal (IBM) - moved SystemPreferencesManager to a new package
@ -140,7 +140,7 @@ import org.eclipse.ui.views.framelist.FrameList;
/** /**
* This is the desktop view wrapper of the System View viewer. * This is the desktop view wrapper of the System View viewer.
*/ */
public class SystemViewPart public class SystemViewPart
extends ViewPart extends ViewPart
implements ISetSelectionTarget, IShellProvider, ISystemMessageLine, IElementFactory, IPersistableElement, IAdapterFactory, ISystemPreferenceChangeListener, ISelectionChangedListener, IRSEViewPart implements ISetSelectionTarget, IShellProvider, ISystemMessageLine, IElementFactory, IPersistableElement, IAdapterFactory, ISystemPreferenceChangeListener, ISelectionChangedListener, IRSEViewPart
{ {
@ -157,10 +157,10 @@ public class SystemViewPart
protected FrameList frameList; protected FrameList frameList;
protected SystemViewPartGotoActionGroup gotoActionGroup; protected SystemViewPartGotoActionGroup gotoActionGroup;
// link with editor stuff // link with editor stuff
protected boolean _isLinkingEnabled = false; protected boolean _isLinkingEnabled = false;
// view linker is used when a link with editor is required // view linker is used when a link with editor is required
protected IViewLinker _viewLinker; protected IViewLinker _viewLinker;
@ -195,8 +195,8 @@ public class SystemViewPart
public static final String MEMENTO_DELIM = "///"; //$NON-NLS-1$ public static final String MEMENTO_DELIM = "///"; //$NON-NLS-1$
// constants // constants
public static final String ID = "org.eclipse.rse.ui.view.systemView"; // matches id in plugin.xml, view tag //$NON-NLS-1$ public static final String ID = "org.eclipse.rse.ui.view.systemView"; // matches id in plugin.xml, view tag //$NON-NLS-1$
/** /**
* SystemViewPart constructor. * SystemViewPart constructor.
@ -218,7 +218,7 @@ public class SystemViewPart
{ {
return systemView; return systemView;
} }
/** /**
* When an element is added/deleted/changed/etc and we have focus, this * When an element is added/deleted/changed/etc and we have focus, this
* method is called. See SystemStaticHelpers.selectReveal method. * method is called. See SystemStaticHelpers.selectReveal method.
@ -230,7 +230,7 @@ public class SystemViewPart
/** /**
* Returns the name for the given element. * Returns the name for the given element.
* Used as the name for the current frame. * Used as the name for the current frame.
*/ */
protected String getFrameName(Object element) protected String getFrameName(Object element)
{ {
@ -250,7 +250,7 @@ public class SystemViewPart
{ {
return _isLinkingEnabled; return _isLinkingEnabled;
} }
public void setLinkingEnabled(boolean flag, IViewLinker viewLinker) public void setLinkingEnabled(boolean flag, IViewLinker viewLinker)
{ {
_isLinkingEnabled = flag; _isLinkingEnabled = flag;
@ -270,7 +270,7 @@ public class SystemViewPart
/** /**
* An editor has been activated. Sets the selection in this navigator * An editor has been activated. Sets the selection in this navigator
* to be the editor's input, if linking is enabled. * to be the editor's input, if linking is enabled.
* *
* @param editor the active editor * @param editor the active editor
*/ */
protected void editorActivated(IEditorPart editor) protected void editorActivated(IEditorPart editor)
@ -282,7 +282,7 @@ public class SystemViewPart
_viewLinker.linkEditorToView(editor, systemView); _viewLinker.linkEditorToView(editor, systemView);
} }
} }
/** /**
* Updates the title text and title tool tip. * Updates the title text and title tool tip.
* Called whenever the input of the viewer changes. * Called whenever the input of the viewer changes.
*/ */
@ -337,7 +337,7 @@ public class SystemViewPart
this.input = input; this.input = input;
}*/ }*/
/** /**
* Creates the SWT controls for a part. * Creates the SWT controls for a part.
* Called by Eclipse framework. * Called by Eclipse framework.
*/ */
public void createPartControl(Composite parent) public void createPartControl(Composite parent)
@ -362,7 +362,7 @@ public class SystemViewPart
statusLine = actionBars.getStatusLineManager(); statusLine = actionBars.getStatusLineManager();
} }
// register global edit actions // register global edit actions
Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard(); Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars()); CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
@ -384,7 +384,7 @@ public class SystemViewPart
handleDoubleClick(event); handleDoubleClick(event);
} }
}); });
//prime the selection //prime the selection
//selectionChanged(null, getSite().getDesktopWindow().getSelectionService().getSelection()); //selectionChanged(null, getSite().getDesktopWindow().getSelectionService().getSelection());
@ -422,7 +422,7 @@ public class SystemViewPart
Job waitForRestoreCompleteJob = new Job("WaitForRestoreComplete") { //$NON-NLS-1$ Job waitForRestoreCompleteJob = new Job("WaitForRestoreComplete") { //$NON-NLS-1$
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
try { try {
//Wait for initRSEJob. //Wait for initRSEJob.
initRSEJob.waitForCompletion(); initRSEJob.waitForCompletion();
//callback //callback
display.asyncExec(new Runnable() { display.asyncExec(new Runnable() {
@ -462,7 +462,7 @@ public class SystemViewPart
// assume this is the primary RSE view // assume this is the primary RSE view
// WE GET ALL THE WAY HERE, BUT THESE LINES OF CODE ARE INEFFECTIVE FOR SOME REASON!! // WE GET ALL THE WAY HERE, BUT THESE LINES OF CODE ARE INEFFECTIVE FOR SOME REASON!!
if (systemView.getTree().getItemCount() > 0) { if (systemView.getTree().getItemCount() > 0) {
TreeItem firstItem = systemView.getTree().getItems()[0]; TreeItem firstItem = systemView.getTree().getItems()[0];
systemView.setSelection(new StructuredSelection(firstItem.getData())); systemView.setSelection(new StructuredSelection(firstItem.getData()));
@ -470,7 +470,7 @@ public class SystemViewPart
} }
} }
} }
/** /**
* Handles double clicks in viewer. * Handles double clicks in viewer.
* Opens editor if file double-clicked. * Opens editor if file double-clicked.
@ -488,7 +488,7 @@ public class SystemViewPart
adapter.handleDoubleClick(element); adapter.handleDoubleClick(element);
} }
/** /**
* Creates the frame source and frame list, and connects them. * Creates the frame source and frame list, and connects them.
*/ */
@ -542,7 +542,7 @@ public class SystemViewPart
IWorkbench wb = PlatformUI.getWorkbench(); IWorkbench wb = PlatformUI.getWorkbench();
wb.getActiveWorkbenchWindow().getShell().setFocus(); wb.getActiveWorkbenchWindow().getShell().setFocus();
systemView.getControl().setFocus(); systemView.getControl().setFocus();
/* the following was an attempt to fix problem with scrollbar needing two clicks to activate. didn't help. /* the following was an attempt to fix problem with scrollbar needing two clicks to activate. didn't help.
if (!SystemPreferencesGlobal.getGlobalSystemPreferences().getRememberState()) if (!SystemPreferencesGlobal.getGlobalSystemPreferences().getRememberState())
{ {
TreeItem[] roots = systemView.getTree().getItems(); TreeItem[] roots = systemView.getTree().getItems();
@ -565,9 +565,9 @@ public class SystemViewPart
} }
} }
// link back to editor // link back to editor
protected void linkToEditor(IStructuredSelection selection) protected void linkToEditor(IStructuredSelection selection)
{ {
if (_viewLinker != null) if (_viewLinker != null)
{ {
@ -595,7 +595,7 @@ public class SystemViewPart
// much constants from the remote system view context menu as possible. // much constants from the remote system view context menu as possible.
// This in particular makes orientating and contributing via plugin.xml // This in particular makes orientating and contributing via plugin.xml
// much easier. // much easier.
IToolBarManager toolBarMgr = actionBars.getToolBarManager(); IToolBarManager toolBarMgr = actionBars.getToolBarManager();
if (showConnectionActions) if (showConnectionActions)
{ {
@ -631,7 +631,7 @@ public class SystemViewPart
} }
} }
} }
/** /**
* Pulldown the local toolbar menu with actions * Pulldown the local toolbar menu with actions
*/ */
@ -663,7 +663,7 @@ public class SystemViewPart
menuMgr.add(new Separator()); menuMgr.add(new Separator());
menuMgr.add(wwProfilesAction); menuMgr.add(wwProfilesAction);
menuMgr.add(new Separator()); menuMgr.add(new Separator());
// moved Qualify Connection Names from here for d51541 // moved Qualify Connection Names from here for d51541
//menuMgr.add(new Separator()); d51541 //menuMgr.add(new Separator()); d51541
} }
menuMgr.add(refreshAllAction); menuMgr.add(refreshAllAction);
@ -677,13 +677,17 @@ public class SystemViewPart
} }
//menuMgr.add(userIdPerSystemTypeAction.getSubMenu()); d51541 //menuMgr.add(userIdPerSystemTypeAction.getSubMenu()); d51541
menuMgr.add(showFilterPoolsAction); menuMgr.add(showFilterPoolsAction);
menuMgr.add(restoreStateAction); // d51541 menuMgr.add(restoreStateAction); // d51541
// Now display any contributed action shortcuts for bringing up // Now display any contributed action shortcuts for bringing up
// a particular preference page... // a particular preference page...
MenuManager subMenu = new MenuManager(SystemResources.ACTION_CASCADING_PREFERENCES_LABEL, ISystemContextMenuConstants.MENU_PREFERENCES); MenuManager subMenu = new MenuManager(SystemResources.ACTION_CASCADING_PREFERENCES_LABEL, ISystemContextMenuConstants.MENU_PREFERENCES);
menuMgr.add(subMenu); menuMgr.add(subMenu);
// The initial "RSE" Preference page action is added hardcoded.
// This comes from the former SystemCascadingPreferencesAction.
// FIXME will be moved to using command/hander extension point as per
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769
SystemShowPreferencesPageAction action = new SystemShowPreferencesPageAction(); SystemShowPreferencesPageAction action = new SystemShowPreferencesPageAction();
action.setPreferencePageID("org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage"); //$NON-NLS-1$ action.setPreferencePageID("org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage"); //$NON-NLS-1$
action.setText(SystemResources.ACTION_SHOW_PREFERENCEPAGE_LABEL); action.setText(SystemResources.ACTION_SHOW_PREFERENCEPAGE_LABEL);
@ -712,7 +716,7 @@ public class SystemViewPart
//System.out.println("INSIDE DISPOSE FOR SYSTEMVIEWPART."); //System.out.println("INSIDE DISPOSE FOR SYSTEMVIEWPART.");
} }
/** /**
* Returns the initial input provider for the viewer. * Returns the initial input provider for the viewer.
* Tries to deduce the appropriate input provider based on current input. * Tries to deduce the appropriate input provider based on current input.
*/ */
@ -762,11 +766,11 @@ public class SystemViewPart
if (platformManager != null) if (platformManager != null)
registerWithManager(platformManager, inputObj); registerWithManager(platformManager, inputObj);
//msg = "INSIDE GETINPUTPROVIDER FOR SYSTEMVIEWPART: inputObj="+inputObj+", input class="+inputObj.getClass().getName()+", inputProvider="+inputProvider; //msg = "INSIDE GETINPUTPROVIDER FOR SYSTEMVIEWPART: inputObj="+inputObj+", input class="+inputObj.getClass().getName()+", inputProvider="+inputProvider;
} }
else else
{ {
//msg = "INSIDE GETINPUTPROVIDER FOR SYSTEMVIEWPART: inputObj is null, inputProvider="+inputProvider; //msg = "INSIDE GETINPUTPROVIDER FOR SYSTEMVIEWPART: inputObj is null, inputProvider="+inputProvider;
} }
//RSEUIPlugin.logDebugMessage(this.getClass().getName(),msg); //RSEUIPlugin.logDebugMessage(this.getClass().getName(),msg);
//System.out.println("INSIDE getInputProvider. inputProvider = "+inputProvider); //System.out.println("INSIDE getInputProvider. inputProvider = "+inputProvider);
@ -877,7 +881,7 @@ public class SystemViewPart
if (statusLine != null) if (statusLine != null)
statusLine.setMessage(message); statusLine.setMessage(message);
} }
/** /**
*If the message line currently displays an error, *If the message line currently displays an error,
* the message is stored and will be shown after a call to clearErrorMessage * the message is stored and will be shown after a call to clearErrorMessage
*/ */
@ -896,7 +900,7 @@ public class SystemViewPart
* within the part controls. * within the part controls.
* <p> * <p>
* The parent's default implementation will ignore the memento and initialize * The parent's default implementation will ignore the memento and initialize
* the view in a fresh state. Subclasses may override the implementation to * the view in a fresh state. Subclasses may override the implementation to
* perform any state restoration as needed. * perform any state restoration as needed.
*/ */
public void init(IViewSite site, IMemento memento) throws PartInitException public void init(IViewSite site, IMemento memento) throws PartInitException
@ -918,7 +922,7 @@ public class SystemViewPart
{ {
AbstractUIPlugin plugin = (AbstractUIPlugin) Platform.getPlugin(PlatformUI.PLUGIN_ID); AbstractUIPlugin plugin = (AbstractUIPlugin) Platform.getPlugin(PlatformUI.PLUGIN_ID);
URL installURL = plugin.getDescriptor().getInstallURL(); URL installURL = plugin.getDescriptor().getInstallURL();
URL url = new URL(installURL, iconPath + relativePath); URL url = new URL(installURL, iconPath + relativePath);
ImageDescriptor descriptor = ImageDescriptor.createFromURL(url); ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
return descriptor; return descriptor;
@ -963,7 +967,7 @@ public class SystemViewPart
// restoring expansion state and hence will abandon it. // restoring expansion state and hence will abandon it.
memento.putString(TAG_SHOWFILTERPOOLS, SystemPreferencesManager.getShowFilterPools() ? "t" : "f"); //$NON-NLS-1$ //$NON-NLS-2$ memento.putString(TAG_SHOWFILTERPOOLS, SystemPreferencesManager.getShowFilterPools() ? "t" : "f"); //$NON-NLS-1$ //$NON-NLS-2$
//memento.putString(TAG_SHOWFILTERSTRINGS, SystemPreferencesManager.getPreferencesManager().getShowFilterStrings() ? "t" : "f"); //memento.putString(TAG_SHOWFILTERSTRINGS, SystemPreferencesManager.getPreferencesManager().getShowFilterStrings() ? "t" : "f");
String inputMemento = memento.getString("factoryID"); // see IWorkbenchWindow ... this is only clue I can figure out! //$NON-NLS-1$ String inputMemento = memento.getString("factoryID"); // see IWorkbenchWindow ... this is only clue I can figure out! //$NON-NLS-1$
if (inputMemento != null) if (inputMemento != null)
@ -1080,7 +1084,7 @@ public class SystemViewPart
//System.out.println("SYSTEMVIEWPART: restoreState"); //System.out.println("SYSTEMVIEWPART: restoreState");
if (!SystemPreferencesManager.getPreferencesManager().getRememberState()) if (!SystemPreferencesManager.getPreferencesManager().getRememberState())
return; return;
// restore the show filter pools and show filter strings settings as they were when this was saved // restore the show filter pools and show filter strings settings as they were when this was saved
boolean showFilterPools = false; boolean showFilterPools = false;
boolean showFilterStrings = false; boolean showFilterStrings = false;
@ -1089,22 +1093,22 @@ public class SystemViewPart
showFilterPools = savedValue.equals("t"); showFilterPools = savedValue.equals("t");
else else
showFilterPools = SystemPreferencesManager.getPreferencesManager().getShowFilterPools(); showFilterPools = SystemPreferencesManager.getPreferencesManager().getShowFilterPools();
savedValue = memento.getString(TAG_SHOWFILTERSTRINGS); // historical savedValue = memento.getString(TAG_SHOWFILTERSTRINGS); // historical
if (savedValue != null) if (savedValue != null)
showFilterStrings = savedValue.equals("t"); showFilterStrings = savedValue.equals("t");
//else //else
//showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings(); //showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings();
IMemento childMem = null; IMemento childMem = null;
// restore expand-to hashtable state // restore expand-to hashtable state
childMem= memento.getChild(TAG_EXPANDED_TO); childMem= memento.getChild(TAG_EXPANDED_TO);
if (childMem != null) if (childMem != null)
{ {
IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT); IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT);
Hashtable ht = new Hashtable(); Hashtable ht = new Hashtable();
for (int i= 0; i < elementMem.length; i++) for (int i= 0; i < elementMem.length; i++)
{ {
String key = elementMem[i].getString(TAG_PATH); String key = elementMem[i].getString(TAG_PATH);
String value = elementMem[i].getString(TAG_FILTER); String value = elementMem[i].getString(TAG_FILTER);
@ -1114,16 +1118,16 @@ public class SystemViewPart
if (ht.size() > 0) if (ht.size() > 0)
systemView.setExpandToFilterTable(ht); systemView.setExpandToFilterTable(ht);
} }
// restore expansion state // restore expansion state
childMem= memento.getChild(TAG_EXPANDED); childMem= memento.getChild(TAG_EXPANDED);
if (childMem != null) if (childMem != null)
{ {
ArrayList elements= new ArrayList(); ArrayList elements= new ArrayList();
Vector remoteElements = new Vector(); Vector remoteElements = new Vector();
IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT); IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT);
// walk through list of expanded nodes, breaking into 2 lists: non-remote and remote // walk through list of expanded nodes, breaking into 2 lists: non-remote and remote
for (int i= 0; i < elementMem.length; i++) for (int i= 0; i < elementMem.length; i++)
{ {
Object element= getObjectFromMemento(showFilterPools, showFilterStrings, elementMem[i].getString(TAG_PATH)); Object element= getObjectFromMemento(showFilterPools, showFilterStrings, elementMem[i].getString(TAG_PATH));
if (element != null) if (element != null)
@ -1154,15 +1158,15 @@ public class SystemViewPart
} }
} }
} }
// restoreSelection // restoreSelection
childMem= memento.getChild(TAG_SELECTION); childMem= memento.getChild(TAG_SELECTION);
if (childMem != null) if (childMem != null)
{ {
ArrayList list= new ArrayList(); ArrayList list= new ArrayList();
Vector remoteElements = new Vector(); Vector remoteElements = new Vector();
IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT); IMemento[] elementMem= childMem.getChildren(TAG_ELEMENT);
for (int i= 0; i < elementMem.length; i++) for (int i= 0; i < elementMem.length; i++)
{ {
Object element= getObjectFromMemento(showFilterPools, showFilterStrings, elementMem[i].getString(TAG_PATH)); Object element= getObjectFromMemento(showFilterPools, showFilterStrings, elementMem[i].getString(TAG_PATH));
if (element != null) if (element != null)
@ -1182,7 +1186,7 @@ public class SystemViewPart
v.addElement(ro.name); v.addElement(ro.name);
} }
SystemResourceChangeEvent event = new SystemResourceChangeEvent(v,ISystemResourceChangeEvents.EVENT_SELECT_REMOTE,null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(v,ISystemResourceChangeEvents.EVENT_SELECT_REMOTE,null);
systemView.systemResourceChanged(event); systemView.systemResourceChanged(event);
} }
} }
Tree tree= systemView.getTree(); Tree tree= systemView.getTree();
@ -1190,7 +1194,7 @@ public class SystemViewPart
ScrollBar bar= tree.getVerticalBar(); ScrollBar bar= tree.getVerticalBar();
if (bar != null) if (bar != null)
{ {
try try
{ {
String posStr= memento.getString(TAG_VERTICAL_POSITION); String posStr= memento.getString(TAG_VERTICAL_POSITION);
if (posStr != null) if (posStr != null)
@ -1199,15 +1203,15 @@ public class SystemViewPart
position= new Integer(posStr).intValue(); position= new Integer(posStr).intValue();
bar.setSelection(position); bar.setSelection(position);
} }
} catch (NumberFormatException e) } catch (NumberFormatException e)
{ {
} }
} }
//restore vertical position //restore vertical position
bar= tree.getHorizontalBar(); bar= tree.getHorizontalBar();
if (bar != null) if (bar != null)
{ {
try try
{ {
String posStr= memento.getString(TAG_HORIZONTAL_POSITION); String posStr= memento.getString(TAG_HORIZONTAL_POSITION);
if (posStr != null) if (posStr != null)
@ -1216,7 +1220,7 @@ public class SystemViewPart
position= new Integer(posStr).intValue(); position= new Integer(posStr).intValue();
bar.setSelection(position); bar.setSelection(position);
} }
} catch (NumberFormatException e) } catch (NumberFormatException e)
{ {
} }
} }
@ -1255,22 +1259,22 @@ public class SystemViewPart
// 1. connections // 1. connections
// 2. subsystems // 2. subsystems
// 3. filter pools (optional) // 3. filter pools (optional)
// 4. filters // 4. filters
// 5. filter strings (optional) // 5. filter strings (optional)
// 6. remote objects // 6. remote objects
// 1. connections // 1. connections
// 2. subsystems // 2. subsystems
// 3. filters // 3. filters
// 4. filter strings (optional) // 4. filter strings (optional)
// 5. remote objects // 5. remote objects
// 1. connections // 1. connections
// 2. subsystems // 2. subsystems
// 3. filter pools (optional) // 3. filter pools (optional)
// 4. filters // 4. filters
// 5. remote objects // 5. remote objects
// 1. connections // 1. connections
// 2. subsystems // 2. subsystems
// 3. filters // 3. filters
// 4. remote objects // 4. remote objects
int index = 0; int index = 0;
@ -1340,7 +1344,7 @@ public class SystemViewPart
if (refs[refidx].getFullName().equals(poolName)) if (refs[refidx].getFullName().equals(poolName))
fpRef = refs[refidx]; fpRef = refs[refidx];
} }
// TODO: handle nested filters. in this case they are separated by ';'. See SystemFilterReferenceAdapter's getMementoHandle() // TODO: handle nested filters. in this case they are separated by ';'. See SystemFilterReferenceAdapter's getMementoHandle()
if (fpRef != null) if (fpRef != null)
{ {
@ -1452,7 +1456,7 @@ public class SystemViewPart
{ {
lastToken = token.toString(); lastToken = token.toString();
v.addElement(lastToken); v.addElement(lastToken);
//System.out.println("...token: " + token); //System.out.println("...token: " + token);
token.setLength(0); token.setLength(0);
idx += delimLen - 1; idx += delimLen - 1;
} }
@ -1477,36 +1481,36 @@ public class SystemViewPart
_restoredObject = restoredObject; _restoredObject = restoredObject;
_children = children; _children = children;
} }
public void run() public void run()
{ {
Vector matches = new Vector(); Vector matches = new Vector();
systemView.findAllRemoteItemReferences(_restoredObject, _restoredObject, matches); systemView.findAllRemoteItemReferences(_restoredObject, _restoredObject, matches);
if (matches.size() > 0){ if (matches.size() > 0){
TreeItem item = (TreeItem)matches.get(0); TreeItem item = (TreeItem)matches.get(0);
systemView.createTreeItems(item, _children); systemView.createTreeItems(item, _children);
item.setExpanded(true); item.setExpanded(true);
} }
} }
} }
protected class RestoreRemoteObjects extends Job protected class RestoreRemoteObjects extends Job
{ {
private Vector _remoteObjectsToRestore; private Vector _remoteObjectsToRestore;
private List _cacheSubSystemList; private List _cacheSubSystemList;
private Vector _remoteObjectsToSelect; private Vector _remoteObjectsToSelect;
public RestoreRemoteObjects(Vector remoteObjects, List cacheSubSystemList, Vector remoteObjectsToSelect) public RestoreRemoteObjects(Vector remoteObjects, List cacheSubSystemList, Vector remoteObjectsToSelect)
{ {
super("Restore Remote Objects"); //$NON-NLS-1$ super("Restore Remote Objects"); //$NON-NLS-1$
_remoteObjectsToRestore = remoteObjects; _remoteObjectsToRestore = remoteObjects;
_cacheSubSystemList = cacheSubSystemList; _cacheSubSystemList = cacheSubSystemList;
_remoteObjectsToSelect = remoteObjectsToSelect; _remoteObjectsToSelect = remoteObjectsToSelect;
} }
protected IStatus run(IProgressMonitor monitor) protected IStatus run(IProgressMonitor monitor)
{ {
IStatus status = doRestore(monitor); IStatus status = doRestore(monitor);
if (status.isOK()){ if (status.isOK()){
@ -1514,42 +1518,42 @@ public class SystemViewPart
} }
return status; return status;
} }
protected IStatus doSelect(IProgressMonitor monitor) protected IStatus doSelect(IProgressMonitor monitor)
{ {
Vector v = new Vector(); Vector v = new Vector();
for (int i = 0; i < _remoteObjectsToSelect.size(); i++){ for (int i = 0; i < _remoteObjectsToSelect.size(); i++){
Object object = _remoteObjectsToSelect.get(i); Object object = _remoteObjectsToSelect.get(i);
if (object instanceof RemoteObject) if (object instanceof RemoteObject)
{ {
RemoteObject robject = (RemoteObject)object; RemoteObject robject = (RemoteObject)object;
v.addElement(robject.name); v.addElement(robject.name);
} }
} }
SystemResourceChangeEvent event = new SystemResourceChangeEvent(v, ISystemResourceChangeEvents.EVENT_SELECT_REMOTE, null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(v, ISystemResourceChangeEvents.EVENT_SELECT_REMOTE, null);
systemView.systemResourceChanged(event); systemView.systemResourceChanged(event);
return Status.OK_STATUS; return Status.OK_STATUS;
} }
protected IStatus doRestore(IProgressMonitor monitor) protected IStatus doRestore(IProgressMonitor monitor)
{ {
for (int i = 0; i < _remoteObjectsToRestore.size(); i++){ for (int i = 0; i < _remoteObjectsToRestore.size(); i++){
if (monitor.isCanceled()){ if (monitor.isCanceled()){
return Status.CANCEL_STATUS; return Status.CANCEL_STATUS;
} }
Object object = _remoteObjectsToRestore.get(i); Object object = _remoteObjectsToRestore.get(i);
if (object instanceof RemoteObject) if (object instanceof RemoteObject)
{ {
RemoteObject robject = (RemoteObject)object; RemoteObject robject = (RemoteObject)object;
ISubSystem ss = robject.subsystem; ISubSystem ss = robject.subsystem;
// yantzi: artemis 6.0: notify subsystems that this is a restore from memento so they // yantzi: artemis 6.0: notify subsystems that this is a restore from memento so they
// can optionally use the cache if desired // can optionally use the cache if desired
if (ss != null && ss.supportsCaching()) if (ss != null && ss.supportsCaching())
{ {
@ -1559,37 +1563,37 @@ public class SystemViewPart
if (!ss.isOffline()){ if (!ss.isOffline()){
String path = robject.name; String path = robject.name;
ISystemFilterReference fref = robject.fRef; ISystemFilterReference fref = robject.fRef;
try try
{ {
Object actualObject = ss.getObjectWithAbsoluteName(path, monitor); Object actualObject = ss.getObjectWithAbsoluteName(path, monitor);
if (actualObject instanceof IAdaptable) if (actualObject instanceof IAdaptable)
{ {
// get the adapter // get the adapter
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)actualObject).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)actualObject).getAdapter(ISystemViewElementAdapter.class);
// get the context // get the context
ContextObject contextObject = new ContextObject(actualObject, ss, fref); ContextObject contextObject = new ContextObject(actualObject, ss, fref);
// get the children // get the children
Object[] children = adapter.getChildren(contextObject, monitor); Object[] children = adapter.getChildren(contextObject, monitor);
ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(actualObject, children); ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(actualObject, children);
Display.getDefault().asyncExec(showRunnable); Display.getDefault().asyncExec(showRunnable);
} }
} }
catch (Exception e) catch (Exception e)
{ {
// unexpected // unexpected
} }
// yantzi: artemis 6.0: reset restore from memento flag // yantzi: artemis 6.0: reset restore from memento flag
if (ss != null && ss.supportsCaching()) if (ss != null && ss.supportsCaching())
{ {
ss.getCacheManager().setRestoreFromMemento(false); ss.getCacheManager().setRestoreFromMemento(false);
} }
} }
} }
else if (object instanceof ISystemFilterReference) else if (object instanceof ISystemFilterReference)
@ -1610,16 +1614,16 @@ public class SystemViewPart
{ {
// get the adapter // get the adapter
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)object).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)object).getAdapter(ISystemViewElementAdapter.class);
// get the context // get the context
ContextObject contextObject = new ContextObject(fref, ss, fref); ContextObject contextObject = new ContextObject(fref, ss, fref);
// get the children // get the children
Object[] children = adapter.getChildren(contextObject, monitor); Object[] children = adapter.getChildren(contextObject, monitor);
ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(fref, children); ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(fref, children);
Display.getDefault().asyncExec(showRunnable); Display.getDefault().asyncExec(showRunnable);
} }
} }
} }
} }
@ -1632,11 +1636,11 @@ public class SystemViewPart
((ISubSystem) _cacheSubSystemList.get(i)).getCacheManager().setRestoreFromMemento(false); ((ISubSystem) _cacheSubSystemList.get(i)).getCacheManager().setRestoreFromMemento(false);
} }
} }
return Status.OK_STATUS; return Status.OK_STATUS;
} }
} }
protected class RemoteObject protected class RemoteObject
{ {
public String name; public String name;
@ -1656,14 +1660,14 @@ public class SystemViewPart
{ {
return "Remote object: " + name; //$NON-NLS-1$ return "Remote object: " + name; //$NON-NLS-1$
} }
public boolean equals(RemoteObject compared) public boolean equals(RemoteObject compared)
{ {
if (name.equals(compared.name) && if (name.equals(compared.name) &&
subsystem == compared.subsystem && subsystem == compared.subsystem &&
fRef == compared.fRef) fRef == compared.fRef)
return true; return true;
return false; return false;
} }
} }
@ -1696,10 +1700,10 @@ public class SystemViewPart
{ {
super("Restore RSE Tree"); //$NON-NLS-1$ super("Restore RSE Tree"); //$NON-NLS-1$
_memento = memento; _memento = memento;
} }
public IStatus runInUIThread(IProgressMonitor monitor) public IStatus runInUIThread(IProgressMonitor monitor)
{ {
IMemento memento = _memento; IMemento memento = _memento;
//System.out.println("SYSTEMVIEWPART: restoreState"); //System.out.println("SYSTEMVIEWPART: restoreState");
@ -1747,12 +1751,12 @@ public class SystemViewPart
if (childMem != null) if (childMem != null)
{ {
ArrayList elements = new ArrayList(); ArrayList elements = new ArrayList();
IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT); IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT);
// yantzi: artemis6.0, keep track subsystems which have their memento flag set in order // yantzi: artemis6.0, keep track subsystems which have their memento flag set in order
// to restore system view from cache (if the subsystem supports this) // to restore system view from cache (if the subsystem supports this)
ISubSystem cacheSubSystem; ISubSystem cacheSubSystem;
boolean restoreFromCache = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.RESTORE_STATE_FROM_CACHE); boolean restoreFromCache = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.RESTORE_STATE_FROM_CACHE);
@ -1771,7 +1775,7 @@ public class SystemViewPart
remoteElementsToRestore.add(element); // filters trigger asynchronous queries, so best to expand this with remote items remoteElementsToRestore.add(element); // filters trigger asynchronous queries, so best to expand this with remote items
if (restoreFromCache) if (restoreFromCache)
{ {
// yantzi: artemis 6.0, see comment above // yantzi: artemis 6.0, see comment above
cacheSubSystem = ((ISystemFilterReference)element).getSubSystem(); cacheSubSystem = ((ISystemFilterReference)element).getSubSystem();
if (cacheSubSystem.supportsCaching() && cacheSubSystem.getCacheManager() != null) if (cacheSubSystem.supportsCaching() && cacheSubSystem.getCacheManager() != null)
@ -1793,12 +1797,12 @@ public class SystemViewPart
// restoreSelection // restoreSelection
childMem = memento.getChild(TAG_SELECTION); childMem = memento.getChild(TAG_SELECTION);
Vector remoteElementsToSelect = new Vector(); Vector remoteElementsToSelect = new Vector();
if (childMem != null) if (childMem != null)
{ {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT); IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT);
for (int i = 0; i < elementMem.length; i++) for (int i = 0; i < elementMem.length; i++)
{ {
@ -1814,13 +1818,13 @@ public class SystemViewPart
systemView.setSelection(new StructuredSelection(list)); systemView.setSelection(new StructuredSelection(list));
} }
} }
if (remoteElementsToRestore.size() > 0) if (remoteElementsToRestore.size() > 0)
{ {
RestoreRemoteObjects restoreRemoteJob = new RestoreRemoteObjects(remoteElementsToRestore, cacheSubSystemList, remoteElementsToSelect); RestoreRemoteObjects restoreRemoteJob = new RestoreRemoteObjects(remoteElementsToRestore, cacheSubSystemList, remoteElementsToSelect);
restoreRemoteJob.schedule(); restoreRemoteJob.schedule();
} }
Tree tree = systemView.getTree(); Tree tree = systemView.getTree();
//restore vertical position //restore vertical position
ScrollBar bar = tree.getVerticalBar(); ScrollBar bar = tree.getVerticalBar();
@ -1858,8 +1862,8 @@ public class SystemViewPart
{ {
} }
} }
String linkWithEditor = memento.getString(TAG_LINKWITHEDITOR); String linkWithEditor = memento.getString(TAG_LINKWITHEDITOR);
if (linkWithEditor != null) if (linkWithEditor != null)
{ {
@ -1873,11 +1877,11 @@ public class SystemViewPart
_isLinkingEnabled = false; _isLinkingEnabled = false;
} }
return Status.OK_STATUS; return Status.OK_STATUS;
} }
} }
// THE FOLLOWING ARE TO ENABLE PERSISTENCE OF NON-PRIMARY REMOTE SYSTEM EXPLORER VIEWS OPENED UP BY THE // THE FOLLOWING ARE TO ENABLE PERSISTENCE OF NON-PRIMARY REMOTE SYSTEM EXPLORER VIEWS OPENED UP BY THE
@ -1941,7 +1945,7 @@ public class SystemViewPart
* *
public void saveState(IMemento memento) public void saveState(IMemento memento)
{ {
}*/ }*/
/** /**
@ -1982,7 +1986,7 @@ public class SystemViewPart
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types
* with the platform. We prefer to do it here to isolate/encapsulate all factory * with the platform. We prefer to do it here to isolate/encapsulate all factory
* logic in this one place. * logic in this one place.
*/ */
@ -1993,7 +1997,7 @@ public class SystemViewPart
manager.registerAdapters(this, input.getClass()); manager.registerAdapters(this, input.getClass());
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types
* with the platform. We prefer to do it here to isolate/encapsulate all factory * with the platform. We prefer to do it here to isolate/encapsulate all factory
* logic in this one place. * logic in this one place.
*/ */

5
rse/plugins/org.eclipse.rse.ui/plugin.xml
View file

@ -266,7 +266,10 @@ Anna Dushistova (MontaVista) - [234274][api] Launch Shell / Terminal commands m
<!-- ================================================================================= --> <!-- ================================================================================= -->
<!-- Define Remote System Explorer view pulldown menu submenu for preferences actions --> <!-- Define Remote System Explorer view pulldown menu submenu for preferences actions -->
<!-- ================================================================================= --> <!-- ================================================================================= -->
<!-- TODO migrate to command/handler <!-- FIXME this is hardcoded for now, but will be migrated to command/handler -->
<!-- Clients can add their actions already if they create their own handler -->
<!-- See the patch on https://bugs.eclipse.org/bugs/show_bug.cgi?id=186769 -->
<!--
<extension point="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions"> <extension point="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions">
<action <action
id="org.eclipse.rse.ui.preferences.actions.rse" id="org.eclipse.rse.ui.preferences.actions.rse"