mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-26 02:15:31 +02:00
[cleanup] Remove old IBM-RSE @since tags
This commit is contained in:
parent
cbb6942d57
commit
95a37deed4
7 changed files with 59 additions and 85 deletions
|
@ -11,7 +11,7 @@
|
||||||
<body>
|
<body>
|
||||||
<h1><a name="dataelements">Memory Management in DataStore</a></h1>
|
<h1><a name="dataelements">Memory Management in DataStore</a></h1>
|
||||||
<p>
|
<p>
|
||||||
Since RSE version 7.0 a substantial design change has been made to the DataStore that significantly reduces the memory footprint of the
|
A Memory Management scheme has been implemented for the DataStore that significantly reduces the memory footprint of the
|
||||||
DataElements in high-use, long up-time situations. A problem that was identified was that in the DataStore, DataElements were
|
DataElements in high-use, long up-time situations. A problem that was identified was that in the DataStore, DataElements were
|
||||||
rarely being destroyed - only when the files they represented were themselves deleted. When directories in the file system were explored,
|
rarely being destroyed - only when the files they represented were themselves deleted. When directories in the file system were explored,
|
||||||
DataElements were being created to represent the files in the directories, but these DataElements were cached and never
|
DataElements were being created to represent the files in the directories, but these DataElements were cached and never
|
||||||
|
|
|
@ -18,8 +18,6 @@ package org.eclipse.rse.core.subsystems;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface for a cache manager that can optionally associated with a SubSystem.
|
* Interface for a cache manager that can optionally associated with a SubSystem.
|
||||||
*
|
|
||||||
* @since RSE 6.0
|
|
||||||
*/
|
*/
|
||||||
public interface ICacheManager {
|
public interface ICacheManager {
|
||||||
|
|
||||||
|
|
|
@ -497,8 +497,6 @@ public class SystemConnectionForm
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if this system type is enabled for offline support
|
* Check if this system type is enabled for offline support
|
||||||
*
|
|
||||||
* @since RSE 6.0
|
|
||||||
*/
|
*/
|
||||||
private boolean enableOfflineCB()
|
private boolean enableOfflineCB()
|
||||||
{
|
{
|
||||||
|
@ -1229,7 +1227,7 @@ public class SystemConnectionForm
|
||||||
else
|
else
|
||||||
msgLine.clearErrorMessage();
|
msgLine.clearErrorMessage();
|
||||||
else
|
else
|
||||||
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "MSGLINE NULL. TRYING TO WRITE MSG " + msg);
|
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "MSGLINE NULL. TRYING TO WRITE MSG " + msg); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
// ---------------------------------------------------------------
|
||||||
|
|
|
@ -32,7 +32,6 @@ import org.eclipse.swt.widgets.Shell;
|
||||||
* Action for switching RSE Connections offline
|
* Action for switching RSE Connections offline
|
||||||
*
|
*
|
||||||
* @author yantzi
|
* @author yantzi
|
||||||
* @since Artemis 6.0
|
|
||||||
*/
|
*/
|
||||||
public class SystemWorkOfflineAction extends SystemBaseAction
|
public class SystemWorkOfflineAction extends SystemBaseAction
|
||||||
{
|
{
|
||||||
|
@ -96,7 +95,7 @@ public class SystemWorkOfflineAction extends SystemBaseAction
|
||||||
// user cancelled disconnect
|
// user cancelled disconnect
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
SystemBasePlugin.logError("SystemWorkOfflineAction.run", e);
|
SystemBasePlugin.logError("SystemWorkOfflineAction.run", e); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,24 +161,24 @@ public class SystemViewPart
|
||||||
protected SystemPasteFromClipboardAction _pasteAction;
|
protected SystemPasteFromClipboardAction _pasteAction;
|
||||||
|
|
||||||
// Persistence tags.
|
// Persistence tags.
|
||||||
static final String TAG_RELEASE = "release";
|
static final String TAG_RELEASE = "release"; //$NON-NLS-1$
|
||||||
static final String TAG_SELECTION = "selection";
|
static final String TAG_SELECTION = "selection"; //$NON-NLS-1$
|
||||||
static final String TAG_EXPANDED_TO = "expandedTo";
|
static final String TAG_EXPANDED_TO = "expandedTo"; //$NON-NLS-1$
|
||||||
static final String TAG_EXPANDED = "expanded";
|
static final String TAG_EXPANDED = "expanded"; //$NON-NLS-1$
|
||||||
static final String TAG_ELEMENT = "element";
|
static final String TAG_ELEMENT = "element"; //$NON-NLS-1$
|
||||||
static final String TAG_PATH = "path";
|
static final String TAG_PATH = "path"; //$NON-NLS-1$
|
||||||
static final String TAG_FILTER = "filter";
|
static final String TAG_FILTER = "filter"; //$NON-NLS-1$
|
||||||
static final String TAG_INPUT = "svInput";
|
static final String TAG_INPUT = "svInput"; //$NON-NLS-1$
|
||||||
static final String TAG_VERTICAL_POSITION = "verticalPosition";
|
static final String TAG_VERTICAL_POSITION = "verticalPosition"; //$NON-NLS-1$
|
||||||
static final String TAG_HORIZONTAL_POSITION = "horizontalPosition";
|
static final String TAG_HORIZONTAL_POSITION = "horizontalPosition"; //$NON-NLS-1$
|
||||||
static final String TAG_SHOWFILTERPOOLS = "showFilterPools";
|
static final String TAG_SHOWFILTERPOOLS = "showFilterPools"; //$NON-NLS-1$
|
||||||
static final String TAG_SHOWFILTERSTRINGS = "showFilterStrings";
|
static final String TAG_SHOWFILTERSTRINGS = "showFilterStrings"; //$NON-NLS-1$
|
||||||
static final String TAG_LINKWITHEDITOR = "linkWithEditor";
|
static final String TAG_LINKWITHEDITOR = "linkWithEditor"; //$NON-NLS-1$
|
||||||
|
|
||||||
public static final String MEMENTO_DELIM = "///";
|
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
|
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.
|
||||||
|
@ -248,7 +248,6 @@ public class SystemViewPart
|
||||||
* 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
|
||||||
* @since 2.0
|
|
||||||
*/
|
*/
|
||||||
protected void editorActivated(IEditorPart editor)
|
protected void editorActivated(IEditorPart editor)
|
||||||
{
|
{
|
||||||
|
@ -315,7 +314,7 @@ public class SystemViewPart
|
||||||
{
|
{
|
||||||
//IAdaptable inputObj = getSite().getPage().getInput();
|
//IAdaptable inputObj = getSite().getPage().getInput();
|
||||||
Object inputObj = getSystemView().getInput();
|
Object inputObj = getSystemView().getInput();
|
||||||
SystemBasePlugin.logInfo("Inside updateTitle. inputObject class type: " + inputObj.getClass().getName());
|
SystemBasePlugin.logInfo("Inside updateTitle. inputObject class type: " + inputObj.getClass().getName()); //$NON-NLS-1$
|
||||||
if (inputObj != null)
|
if (inputObj != null)
|
||||||
{
|
{
|
||||||
setTitleToolTip(getFrameToolTipText(input));
|
setTitleToolTip(getFrameToolTipText(input));
|
||||||
|
@ -323,27 +322,27 @@ public class SystemViewPart
|
||||||
if (inputObj instanceof IHost)
|
if (inputObj instanceof IHost)
|
||||||
{
|
{
|
||||||
IHost conn = (IHost) inputObj;
|
IHost conn = (IHost) inputObj;
|
||||||
setPartName(viewName + " : " + conn.getAliasName());
|
setPartName(viewName + " : " + conn.getAliasName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISubSystem)
|
else if (inputObj instanceof ISubSystem)
|
||||||
{
|
{
|
||||||
ISubSystem ss = (ISubSystem) inputObj;
|
ISubSystem ss = (ISubSystem) inputObj;
|
||||||
setPartName(viewName + " : " + ss.getName());
|
setPartName(viewName + " : " + ss.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterPoolReference)
|
else if (inputObj instanceof ISystemFilterPoolReference)
|
||||||
{
|
{
|
||||||
ISystemFilterPoolReference sfpr = (ISystemFilterPoolReference) inputObj;
|
ISystemFilterPoolReference sfpr = (ISystemFilterPoolReference) inputObj;
|
||||||
setPartName(viewName + " : " + sfpr.getName());
|
setPartName(viewName + " : " + sfpr.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterReference)
|
else if (inputObj instanceof ISystemFilterReference)
|
||||||
{
|
{
|
||||||
ISystemFilterReference sfr = (ISystemFilterReference) inputObj;
|
ISystemFilterReference sfr = (ISystemFilterReference) inputObj;
|
||||||
setPartName(viewName + " : " + sfr.getName());
|
setPartName(viewName + " : " + sfr.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterStringReference)
|
else if (inputObj instanceof ISystemFilterStringReference)
|
||||||
{
|
{
|
||||||
ISystemFilterStringReference sfsr = (ISystemFilterStringReference) inputObj;
|
ISystemFilterStringReference sfsr = (ISystemFilterStringReference) inputObj;
|
||||||
setPartName(viewName + " : " + sfsr.getString());
|
setPartName(viewName + " : " + sfsr.getString()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -428,7 +427,7 @@ public class SystemViewPart
|
||||||
// listen to editor events for linking
|
// listen to editor events for linking
|
||||||
getSite().getPage().addPartListener(partListener);
|
getSite().getPage().addPartListener(partListener);
|
||||||
|
|
||||||
SystemWidgetHelpers.setHelp(parent, RSEUIPlugin.HELPPREFIX + "sysv0000");
|
SystemWidgetHelpers.setHelp(parent, RSEUIPlugin.HELPPREFIX + "sysv0000"); //$NON-NLS-1$
|
||||||
|
|
||||||
// ----------------------
|
// ----------------------
|
||||||
// Restore previous state
|
// Restore previous state
|
||||||
|
@ -458,8 +457,6 @@ public class SystemViewPart
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates the frame source and frame list, and connects them.
|
* Creates the frame source and frame list, and connects them.
|
||||||
*
|
|
||||||
* @since 2.0
|
|
||||||
*/
|
*/
|
||||||
protected FrameList createFrameList()
|
protected FrameList createFrameList()
|
||||||
{
|
{
|
||||||
|
@ -470,7 +467,6 @@ public class SystemViewPart
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Return the FrameList object for this view part
|
* Return the FrameList object for this view part
|
||||||
* @since 2.0
|
|
||||||
*/
|
*/
|
||||||
public FrameList getFrameList()
|
public FrameList getFrameList()
|
||||||
{
|
{
|
||||||
|
@ -732,31 +728,31 @@ public class SystemViewPart
|
||||||
{
|
{
|
||||||
IHost conn = (IHost) inputObj;
|
IHost conn = (IHost) inputObj;
|
||||||
inputProvider = new SystemViewAPIProviderForConnections(conn);
|
inputProvider = new SystemViewAPIProviderForConnections(conn);
|
||||||
setPartName(getTitle() + " : " + conn.getAliasName());
|
setPartName(getTitle() + " : " + conn.getAliasName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISubSystem)
|
else if (inputObj instanceof ISubSystem)
|
||||||
{
|
{
|
||||||
ISubSystem ss = (ISubSystem) inputObj;
|
ISubSystem ss = (ISubSystem) inputObj;
|
||||||
inputProvider = new SystemViewAPIProviderForSubSystems(ss);
|
inputProvider = new SystemViewAPIProviderForSubSystems(ss);
|
||||||
setPartName(getTitle() + " : " + ss.getName());
|
setPartName(getTitle() + " : " + ss.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterPoolReference)
|
else if (inputObj instanceof ISystemFilterPoolReference)
|
||||||
{
|
{
|
||||||
ISystemFilterPoolReference sfpr = (ISystemFilterPoolReference) inputObj;
|
ISystemFilterPoolReference sfpr = (ISystemFilterPoolReference) inputObj;
|
||||||
inputProvider = new SystemViewAPIProviderForFilterPools(sfpr);
|
inputProvider = new SystemViewAPIProviderForFilterPools(sfpr);
|
||||||
setPartName(getTitle() + " : " + sfpr.getName());
|
setPartName(getTitle() + " : " + sfpr.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterReference)
|
else if (inputObj instanceof ISystemFilterReference)
|
||||||
{
|
{
|
||||||
ISystemFilterReference sfr = (ISystemFilterReference) inputObj;
|
ISystemFilterReference sfr = (ISystemFilterReference) inputObj;
|
||||||
inputProvider = new SystemViewAPIProviderForFilters(sfr);
|
inputProvider = new SystemViewAPIProviderForFilters(sfr);
|
||||||
setPartName(getTitle() + " : " + sfr.getName());
|
setPartName(getTitle() + " : " + sfr.getName()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else if (inputObj instanceof ISystemFilterStringReference)
|
else if (inputObj instanceof ISystemFilterStringReference)
|
||||||
{
|
{
|
||||||
ISystemFilterStringReference sfsr = (ISystemFilterStringReference) inputObj;
|
ISystemFilterStringReference sfsr = (ISystemFilterStringReference) inputObj;
|
||||||
inputProvider = new SystemViewAPIProviderForFilterStrings(sfsr);
|
inputProvider = new SystemViewAPIProviderForFilterStrings(sfsr);
|
||||||
setPartName(getTitle() + " : " + sfsr.getString());
|
setPartName(getTitle() + " : " + sfsr.getString()); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -952,11 +948,11 @@ public class SystemViewPart
|
||||||
|
|
||||||
if (isLinkingEnabled)
|
if (isLinkingEnabled)
|
||||||
{
|
{
|
||||||
memento.putString(TAG_LINKWITHEDITOR, "t");
|
memento.putString(TAG_LINKWITHEDITOR, "t"); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
memento.putString(TAG_LINKWITHEDITOR, "f");
|
memento.putString(TAG_LINKWITHEDITOR, "f"); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
// We record the current release for future in case anything significant changes from release to release
|
// We record the current release for future in case anything significant changes from release to release
|
||||||
|
@ -966,10 +962,10 @@ public class SystemViewPart
|
||||||
// We do this to ensure the states match on restore. If they don't we will be in trouble
|
// We do this to ensure the states match on restore. If they don't we will be in trouble
|
||||||
// restoring expansion state and hence will abandon it.
|
// restoring expansion state and hence will abandon it.
|
||||||
|
|
||||||
memento.putString(TAG_SHOWFILTERPOOLS, SystemPreferencesManager.getPreferencesManager().getShowFilterPools() ? "t" : "f");
|
memento.putString(TAG_SHOWFILTERPOOLS, SystemPreferencesManager.getPreferencesManager().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!
|
String inputMemento = memento.getString("factoryID"); // see IWorkbenchWindow ... this is only clue I can figure out! //$NON-NLS-1$
|
||||||
if (inputMemento != null)
|
if (inputMemento != null)
|
||||||
{
|
{
|
||||||
saveInputState(memento);
|
saveInputState(memento);
|
||||||
|
@ -1268,7 +1264,7 @@ public class SystemViewPart
|
||||||
|
|
||||||
Vector v = tokenize(memento, MEMENTO_DELIM);
|
Vector v = tokenize(memento, MEMENTO_DELIM);
|
||||||
|
|
||||||
String elementType = "";
|
String elementType = ""; //$NON-NLS-1$
|
||||||
String ssName = null;
|
String ssName = null;
|
||||||
//String connName = null;
|
//String connName = null;
|
||||||
//String subsystemName = null;
|
//String subsystemName = null;
|
||||||
|
@ -1506,7 +1502,7 @@ public class SystemViewPart
|
||||||
|
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
return "Remote object: " + name;
|
return "Remote object: " + name; //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1557,7 +1553,7 @@ public class SystemViewPart
|
||||||
String linkWithEditor = memento.getString(TAG_LINKWITHEDITOR);
|
String linkWithEditor = memento.getString(TAG_LINKWITHEDITOR);
|
||||||
if (linkWithEditor != null)
|
if (linkWithEditor != null)
|
||||||
{
|
{
|
||||||
if (linkWithEditor.equals("t"))
|
if (linkWithEditor.equals("t")) //$NON-NLS-1$
|
||||||
{
|
{
|
||||||
isLinkingEnabled = true;
|
isLinkingEnabled = true;
|
||||||
toggleLinkingAction.setChecked(true);
|
toggleLinkingAction.setChecked(true);
|
||||||
|
@ -1572,12 +1568,12 @@ public class SystemViewPart
|
||||||
|
|
||||||
String savedValue = memento.getString(TAG_SHOWFILTERPOOLS);
|
String savedValue = memento.getString(TAG_SHOWFILTERPOOLS);
|
||||||
if (savedValue != null)
|
if (savedValue != null)
|
||||||
showFilterPools = savedValue.equals("t");
|
showFilterPools = savedValue.equals("t"); //$NON-NLS-1$
|
||||||
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"); //$NON-NLS-1$
|
||||||
//else
|
//else
|
||||||
//showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings();
|
//showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings();
|
||||||
|
|
||||||
|
@ -1676,7 +1672,7 @@ public class SystemViewPart
|
||||||
if (doTimings)
|
if (doTimings)
|
||||||
{
|
{
|
||||||
timer.setEndTime();
|
timer.setEndTime();
|
||||||
System.out.println("Time to restore " + ro.name + ": " + timer);
|
System.out.println("Time to restore " + ro.name + ": " + timer); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1724,7 +1720,7 @@ public class SystemViewPart
|
||||||
if (doTimings)
|
if (doTimings)
|
||||||
{
|
{
|
||||||
timer.setEndTime();
|
timer.setEndTime();
|
||||||
System.out.println("Time to select " + v.size() + " elements: " + timer);
|
System.out.println("Time to select " + v.size() + " elements: " + timer); //$NON-NLS-1$ //$NON-NLS-2$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1792,13 +1788,13 @@ public class SystemViewPart
|
||||||
boolean showFilterStrings = false;
|
boolean showFilterStrings = false;
|
||||||
String savedValue = memento.getString(TAG_SHOWFILTERPOOLS);
|
String savedValue = memento.getString(TAG_SHOWFILTERPOOLS);
|
||||||
if (savedValue != null)
|
if (savedValue != null)
|
||||||
showFilterPools = savedValue.equals("t");
|
showFilterPools = savedValue.equals("t"); //$NON-NLS-1$
|
||||||
else
|
else
|
||||||
showFilterPools = SystemPreferencesManager.getPreferencesManager().getShowFilterPools();
|
showFilterPools = SystemPreferencesManager.getPreferencesManager().getShowFilterPools();
|
||||||
|
|
||||||
savedValue = memento.getString(TAG_SHOWFILTERSTRINGS);
|
savedValue = memento.getString(TAG_SHOWFILTERSTRINGS);
|
||||||
if (savedValue != null)
|
if (savedValue != null)
|
||||||
showFilterStrings = savedValue.equals("t");
|
showFilterStrings = savedValue.equals("t"); //$NON-NLS-1$
|
||||||
//else
|
//else
|
||||||
// showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings();
|
// showFilterStrings = SystemPreferencesManager.getPreferencesManager().getShowFilterStrings();
|
||||||
|
|
||||||
|
@ -1823,7 +1819,7 @@ public class SystemViewPart
|
||||||
public String getFactoryId()
|
public String getFactoryId()
|
||||||
{
|
{
|
||||||
//System.out.println("INSIDE GETFACTORYID IN SYSTEMVIEWPART");
|
//System.out.println("INSIDE GETFACTORYID IN SYSTEMVIEWPART");
|
||||||
return "org.eclipse.rse.systemview.elementfactory";
|
return "org.eclipse.rse.systemview.elementfactory"; //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -88,15 +88,6 @@
|
||||||
</complexType>
|
</complexType>
|
||||||
</element>
|
</element>
|
||||||
|
|
||||||
<annotation>
|
|
||||||
<appInfo>
|
|
||||||
<meta.section type="since"/>
|
|
||||||
</appInfo>
|
|
||||||
<documentation>
|
|
||||||
5.1.2
|
|
||||||
</documentation>
|
|
||||||
</annotation>
|
|
||||||
|
|
||||||
<annotation>
|
<annotation>
|
||||||
<appInfo>
|
<appInfo>
|
||||||
<meta.section type="examples"/>
|
<meta.section type="examples"/>
|
||||||
|
|
|
@ -25,10 +25,6 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.core.runtime.IConfigurationElement;
|
|
||||||
import org.eclipse.core.runtime.IExtension;
|
|
||||||
import org.eclipse.core.runtime.IExtensionPoint;
|
|
||||||
import org.eclipse.core.runtime.IExtensionRegistry;
|
|
||||||
import org.eclipse.core.runtime.Platform;
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.jface.preference.IPreferenceStore;
|
import org.eclipse.jface.preference.IPreferenceStore;
|
||||||
import org.eclipse.rse.core.model.SystemSignonInformation;
|
import org.eclipse.rse.core.model.SystemSignonInformation;
|
||||||
|
@ -48,9 +44,9 @@ public class PasswordPersistenceManager {
|
||||||
// Keys used for using the Platform authorization methods
|
// Keys used for using the Platform authorization methods
|
||||||
// The server url is generic so we can lookup all registered user IDs / passwords
|
// The server url is generic so we can lookup all registered user IDs / passwords
|
||||||
// to display to the user in the password information preference page
|
// to display to the user in the password information preference page
|
||||||
private static final String SERVER_URL = "file://rse";
|
private static final String SERVER_URL = "file://rse"; //$NON-NLS-1$
|
||||||
|
|
||||||
private static final String AUTH_SCHEME = ""; // no authorization scheme specified for apis
|
private static final String AUTH_SCHEME = ""; // no authorization scheme specified for apis //$NON-NLS-1$
|
||||||
|
|
||||||
// Add return codes
|
// Add return codes
|
||||||
public static final int RC_OK = 0;
|
public static final int RC_OK = 0;
|
||||||
|
@ -59,10 +55,10 @@ public class PasswordPersistenceManager {
|
||||||
|
|
||||||
// Default System Type, on a lookup if the specified system type and hostname is not found
|
// Default System Type, on a lookup if the specified system type and hostname is not found
|
||||||
// then the call will automatically lookup the default system type and hostname
|
// then the call will automatically lookup the default system type and hostname
|
||||||
public static final String DEFAULT_SYSTEM_TYPE = "DEFAULT";
|
public static final String DEFAULT_SYSTEM_TYPE = "DEFAULT"; //$NON-NLS-1$
|
||||||
|
|
||||||
// Default user name
|
// Default user name
|
||||||
public static final String DEFAULT_USER_NAME = "DEFAULT_USER";
|
public static final String DEFAULT_USER_NAME = "DEFAULT_USER"; //$NON-NLS-1$
|
||||||
|
|
||||||
// New URL to store password map
|
// New URL to store password map
|
||||||
private String newURL = null;
|
private String newURL = null;
|
||||||
|
@ -110,7 +106,7 @@ public class PasswordPersistenceManager {
|
||||||
* Singleton so private constructor
|
* Singleton so private constructor
|
||||||
*/
|
*/
|
||||||
private PasswordPersistenceManager(){
|
private PasswordPersistenceManager(){
|
||||||
String userName = System.getProperty("user.name");
|
String userName = System.getProperty("user.name"); //$NON-NLS-1$
|
||||||
|
|
||||||
if (userName == null) {
|
if (userName == null) {
|
||||||
userName = DEFAULT_USER_NAME;
|
userName = DEFAULT_USER_NAME;
|
||||||
|
@ -203,11 +199,9 @@ public class PasswordPersistenceManager {
|
||||||
* and userid.
|
* and userid.
|
||||||
*
|
*
|
||||||
* @param systemtype The system type to check for.
|
* @param systemtype The system type to check for.
|
||||||
* @param hotname The hostname to check for.
|
* @param hname The hostname to check for.
|
||||||
* @param userid The user ID to check for.
|
* @param userid The user ID to check for.
|
||||||
* @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
|
* @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
|
||||||
*
|
|
||||||
* @since RSE 6.2
|
|
||||||
*/
|
*/
|
||||||
public boolean passwordExists(String systemtype, String hname, String userid, boolean checkDefault)
|
public boolean passwordExists(String systemtype, String hname, String userid, boolean checkDefault)
|
||||||
{
|
{
|
||||||
|
@ -347,7 +341,7 @@ public class PasswordPersistenceManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (MalformedURLException e) {
|
catch (MalformedURLException e) {
|
||||||
SystemBasePlugin.logError("PasswordPersistenceManager.getPasswordMap", e);
|
SystemBasePlugin.logError("PasswordPersistenceManager.getPasswordMap", e); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
return passwords;
|
return passwords;
|
||||||
|
@ -365,10 +359,10 @@ public class PasswordPersistenceManager {
|
||||||
Platform.addAuthorizationInfo(serverURL, systemType, AUTH_SCHEME, passwords);
|
Platform.addAuthorizationInfo(serverURL, systemType, AUTH_SCHEME, passwords);
|
||||||
}
|
}
|
||||||
catch (MalformedURLException e) {
|
catch (MalformedURLException e) {
|
||||||
SystemBasePlugin.logError("PasswordPersistenceManager.savePasswordMap", e);
|
SystemBasePlugin.logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
catch (CoreException e) {
|
catch (CoreException e) {
|
||||||
SystemBasePlugin.logError("PasswordPersistenceManager.savePasswordMap", e);
|
SystemBasePlugin.logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -484,11 +478,9 @@ public class PasswordPersistenceManager {
|
||||||
* Find the persisted password for the specified systemtype, hostname and userid.
|
* Find the persisted password for the specified systemtype, hostname and userid.
|
||||||
*
|
*
|
||||||
* @param systemtype The system type to check for.
|
* @param systemtype The system type to check for.
|
||||||
* @param hotname The hostname to check for.
|
* @param hname The hostname to check for.
|
||||||
* @param userid The user ID to check for.
|
* @param userid The user ID to check for.
|
||||||
* @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
|
* @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
|
||||||
*
|
|
||||||
* @since RSE 6.2
|
|
||||||
*/
|
*/
|
||||||
public SystemSignonInformation find(String systemtype, String hname, String userid, boolean checkDefault)
|
public SystemSignonInformation find(String systemtype, String hname, String userid, boolean checkDefault)
|
||||||
{
|
{
|
||||||
|
@ -528,20 +520,20 @@ public class PasswordPersistenceManager {
|
||||||
{
|
{
|
||||||
String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
|
String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
|
||||||
StringBuffer buffer = new StringBuffer(hostname);
|
StringBuffer buffer = new StringBuffer(hostname);
|
||||||
buffer.append("//");
|
buffer.append("//"); //$NON-NLS-1$
|
||||||
buffer.append(userid);
|
buffer.append(userid);
|
||||||
return buffer.toString();
|
return buffer.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getHostnameFromPasswordKey(String passwordKey)
|
private static String getHostnameFromPasswordKey(String passwordKey)
|
||||||
{
|
{
|
||||||
int sepIndex = passwordKey.indexOf("//");
|
int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
|
||||||
return passwordKey.substring(0,sepIndex);
|
return passwordKey.substring(0,sepIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getUserIdFromPasswordKey(String passwordKey)
|
private static String getUserIdFromPasswordKey(String passwordKey)
|
||||||
{
|
{
|
||||||
int sepIndex = passwordKey.indexOf("//");
|
int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
|
||||||
return passwordKey.substring(sepIndex + 2, passwordKey.length());
|
return passwordKey.substring(sepIndex + 2, passwordKey.length());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -609,7 +601,7 @@ public class PasswordPersistenceManager {
|
||||||
while (keys.hasNext())
|
while (keys.hasNext())
|
||||||
{
|
{
|
||||||
key = (String) keys.next();
|
key = (String) keys.next();
|
||||||
separator = key.indexOf("//");
|
separator = key.indexOf("//"); //$NON-NLS-1$
|
||||||
savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
|
savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
|
||||||
key.substring(separator + 2), // userid
|
key.substring(separator + 2), // userid
|
||||||
systemTypes[i].getSystemType())); // system type
|
systemTypes[i].getSystemType())); // system type
|
||||||
|
@ -625,7 +617,7 @@ public class PasswordPersistenceManager {
|
||||||
while (keys.hasNext())
|
while (keys.hasNext())
|
||||||
{
|
{
|
||||||
key = (String) keys.next();
|
key = (String) keys.next();
|
||||||
separator = key.indexOf("//");
|
separator = key.indexOf("//"); //$NON-NLS-1$
|
||||||
savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
|
savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
|
||||||
key.substring(separator + 2), // userid
|
key.substring(separator + 2), // userid
|
||||||
DEFAULT_SYSTEM_TYPE)); // system type
|
DEFAULT_SYSTEM_TYPE)); // system type
|
||||||
|
|
Loading…
Add table
Reference in a new issue