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

Replace RSEUIPlugin.getDefault().getSystemRegistry by getTheSystemRegistry()

Browse source
This commit is contained in:
Martin Oberhuber 2007-04-19 12:02:44 +00:00
parent b8052d89db
commit 5c4fec2dca
24 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
discovery/org.eclipse.rse.discovery/src/org/eclipse/rse/internal/discovery/ServiceDiscoveryWizard.java
View file

@ -103,7 +103,7 @@ public class ServiceDiscoveryWizard extends Wizard {
try { try {
conn = registry.createHost("Discovery", "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$; conn = registry.createHost("Discovery", "Discovery@" + hostName, hostName, "Discovered services in "+hostName);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$;
} catch (Exception e) { } catch (Exception e) {
RSEUIPlugin.getDefault().getSystemRegistry().deleteHost(conn); RSEUIPlugin.getTheSystemRegistry().deleteHost(conn);
return false; return false;
} }
@ -181,7 +181,7 @@ public class ServiceDiscoveryWizard extends Wizard {
} }
} }
RSEUIPlugin.getDefault().getSystemRegistry().expandHost(conn); RSEUIPlugin.getTheSystemRegistry().expandHost(conn);
} }
systemRefreshAllAction.run(); systemRefreshAllAction.run();

2
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
View file

@ -121,7 +121,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
IRunnableContext runnableContext = getRunnableContext(getShell()); IRunnableContext runnableContext = getRunnableContext(getShell());
runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress
_connection.reset(); _connection.reset();
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
} }
catch (InterruptedException exc) // user cancelled catch (InterruptedException exc) // user cancelled

2
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
View file

@ -243,7 +243,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs
//runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress //runnableContext.run(false,true,this); // inthread, cancellable, IRunnableWithProgress
runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress runnableContext.run(true,true,this); // fork, cancellable, IRunnableWithProgress
_connection.reset(); _connection.reset();
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true); sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
} }
catch (InterruptedException exc) // user cancelled catch (InterruptedException exc) // user cancelled

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/SystemRemoteCommandEntryForm.java
View file

@ -136,7 +136,7 @@ public class SystemRemoteCommandEntryForm extends Composite
IHost sysConn = sysConnCombo.getHost(); IHost sysConn = sysConnCombo.getHost();
if ( sysConn != null ) if ( sysConn != null )
{ {
//SubSystem[] cmdSubSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); //SubSystem[] cmdSubSystems = RSEUIPlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn);
IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn);
IRemoteCmdSubSystem currSubSystem = null; IRemoteCmdSubSystem currSubSystem = null;
String subSystemName = subSysCombo.getText(); String subSystemName = subSysCombo.getText();
@ -210,7 +210,7 @@ public class SystemRemoteCommandEntryForm extends Composite
IHost sysConn = sysConnCombo.getHost(); IHost sysConn = sysConnCombo.getHost();
if ( sysConn != null ) if ( sysConn != null )
{ {
//subSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); //subSystems = RSEUIPlugin.getTheSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn);
subSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); subSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn);
for (int i = 0; i < subSystems.length; i++) for (int i = 0; i < subSystems.length; i++)
{ {

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -1395,7 +1395,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
case CommunicationsEvent.AFTER_DISCONNECT : case CommunicationsEvent.AFTER_DISCONNECT :
_cachedRemoteFiles.clear(); _cachedRemoteFiles.clear();
// DKM - taking this out because it causes an exception when the event occurs in Modal Context // DKM - taking this out because it causes an exception when the event occurs in Modal Context
//SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); //SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
//sr.connectedStatusChange(this, false, true, true); //sr.connectedStatusChange(this, false, true, true);
getConnectorService().removeCommunicationsListener(this); getConnectorService().removeCommunicationsListener(this);

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveDownConnectionAction.java
View file

@ -62,7 +62,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e = selection.iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
@ -94,7 +94,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection()); SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
IHost conn = null; IHost conn = null;
for (int idx=0; idx<sortableArray.length; idx++) for (int idx=0; idx<sortableArray.length; idx++)

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemMoveUpConnectionAction.java
View file

@ -62,7 +62,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e = selection.iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
@ -93,7 +93,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
*/ */
public void run() public void run()
{ {
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection()); SystemSortableSelection[] sortableArray = SystemSortableSelection.makeSortableArray(getSelection());
IHost conn = null; IHost conn = null;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
View file

@ -65,7 +65,7 @@ public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseActi
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().fireEvent( RSEUIPlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceRestoreStateAction.java
View file

@ -63,7 +63,7 @@ public class SystemPreferenceRestoreStateAction extends SystemBaseAction
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().fireEvent( RSEUIPlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemPreferenceShowFilterPoolsAction.java
View file

@ -64,7 +64,7 @@ public class SystemPreferenceShowFilterPoolsAction extends SystemBaseAction
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().fireEvent( RSEUIPlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemUpdateConnectionDialog.java
View file

@ -121,7 +121,7 @@ public class SystemUpdateConnectionDialog extends SystemPromptDialog implements
if (closeDialog) if (closeDialog)
{ {
IHost conn = (IHost)getInputObject(); IHost conn = (IHost)getInputObject();
ISystemRegistryUI sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
sr.updateHost( conn,conn.getSystemType().getName(),form.getConnectionName(),form.getHostName(), sr.updateHost( conn,conn.getSystemType().getName(),form.getConnectionName(),form.getHostName(),
form.getConnectionDescription(), form.getDefaultUserId(), form.getConnectionDescription(), form.getDefaultUserId(),
form.getUserIdLocation() ); form.getUserIdLocation() );

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java
View file

@ -343,7 +343,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
public boolean close() public boolean close()
{ {
//RSEUIPlugin.getDefault().getSystemRegistry().removeSystemResourceChangeListener(this); //RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
return super.close(); return super.close();
} }
/** /**

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java
View file

@ -200,7 +200,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = showFilterPoolsEditor.getBooleanValue(); boolean newValue = showFilterPoolsEditor.getBooleanValue();
if (newValue != lastShowFilterPoolsValue) if (newValue != lastShowFilterPoolsValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().setShowFilterPools(newValue); RSEUIPlugin.getTheSystemRegistry().setShowFilterPools(newValue);
firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_SHOWFILTERPOOLS,lastShowFilterPoolsValue,newValue); firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_SHOWFILTERPOOLS,lastShowFilterPoolsValue,newValue);
} }
lastShowFilterPoolsValue = newValue; lastShowFilterPoolsValue = newValue;
@ -210,7 +210,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = showNewConnectionPromptEditor.getBooleanValue(); boolean newValue = showNewConnectionPromptEditor.getBooleanValue();
if (newValue != lastShowNewConnectionPromptValue) if (newValue != lastShowNewConnectionPromptValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().setShowNewHostPrompt(newValue); RSEUIPlugin.getTheSystemRegistry().setShowNewHostPrompt(newValue);
} }
lastShowNewConnectionPromptValue = newValue; lastShowNewConnectionPromptValue = newValue;
} }
@ -219,7 +219,7 @@ public class RemoteSystemsPreferencePage
boolean newValue = qualifyConnectionNamesEditor.getBooleanValue(); boolean newValue = qualifyConnectionNamesEditor.getBooleanValue();
if (newValue != lastQualifyConnectionNamesValue) if (newValue != lastQualifyConnectionNamesValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().setQualifiedHostNames(newValue); RSEUIPlugin.getTheSystemRegistry().setQualifiedHostNames(newValue);
firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_QUALIFYCONNECTIONNAMES,lastQualifyConnectionNamesValue,newValue); firePreferenceChangeEvent(ISystemPreferenceChangeEvents.EVENT_QUALIFYCONNECTIONNAMES,lastQualifyConnectionNamesValue,newValue);
} }
lastQualifyConnectionNamesValue = newValue; lastQualifyConnectionNamesValue = newValue;
@ -242,7 +242,7 @@ public class RemoteSystemsPreferencePage
*/ */
private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue) private void firePreferenceChangeEvent(int type, boolean oldValue, boolean newValue)
{ {
RSEUIPlugin.getDefault().getSystemRegistry().fireEvent( RSEUIPlugin.getTheSystemRegistry().fireEvent(
new SystemPreferenceChangeEvent(type, new SystemPreferenceChangeEvent(type,
oldValue ? Boolean.TRUE : Boolean.FALSE, oldValue ? Boolean.TRUE : Boolean.FALSE,
newValue ? Boolean.TRUE : Boolean.FALSE)); newValue ? Boolean.TRUE : Boolean.FALSE));

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/SystemConnectionPropertyPage.java
View file

@ -88,7 +88,7 @@ public class SystemConnectionPropertyPage extends SystemBasePropertyPage
if (okToClose) if (okToClose)
{ {
IHost conn = (IHost)getElement(); IHost conn = (IHost)getElement();
ISystemRegistryUI sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
sr.updateHost( conn,conn.getSystemType().getName(),form.getConnectionName(),form.getHostName(), sr.updateHost( conn,conn.getSystemType().getName(),form.getConnectionName(),form.getHostName(),
form.getConnectionDescription(), form.getDefaultUserId(), form.getConnectionDescription(), form.getDefaultUserId(),
form.getUserIdLocation() ); form.getUserIdLocation() );

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java
View file

@ -1274,7 +1274,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
*/ */
public boolean doDelete(IProgressMonitor monitor) public boolean doDelete(IProgressMonitor monitor)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();
@ -1366,7 +1366,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
*/ */
public boolean doRename(String[] newNames) public boolean doRename(String[] newNames)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -4505,7 +4505,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy
* Required method from ISystemDeleteTarget * Required method from ISystemDeleteTarget
*/ */
public boolean doDelete(IProgressMonitor monitor) { public boolean doDelete(IProgressMonitor monitor) {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();
@ -4633,7 +4633,7 @@ ISelectionChangedListener, ITreeViewerListener, ISystemResourceChangeEvents, ISy
* Required method from ISystemRenameTarget * Required method from ISystemRenameTarget
*/ */
public boolean doRename(String[] newNames) { public boolean doRename(String[] newNames) {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
Object element = null; Object element = null;

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewConnectionAdapter.java
View file

@ -622,7 +622,7 @@ public class SystemViewConnectionAdapter
//System.out.println("Inside resetPropertyValue in adapter"); //System.out.println("Inside resetPropertyValue in adapter");
String property = (String)propertyObject; String property = (String)propertyObject;
IHost conn = (IHost)propertySourceInput; IHost conn = (IHost)propertySourceInput;
ISystemRegistryUI sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
if (property.equals(ISystemPropertyConstants.P_DEFAULTUSERID)) if (property.equals(ISystemPropertyConstants.P_DEFAULTUSERID))
{ {
@ -650,7 +650,7 @@ public class SystemViewConnectionAdapter
//if (!data.getIsLocal()) //if (!data.getIsLocal())
//whereToUpdate = USERID_LOCATION_DEFAULT_SYSTEMTYPE; //whereToUpdate = USERID_LOCATION_DEFAULT_SYSTEMTYPE;
String userId = data.getLocalValue(); // will be "" if !data.getIsLocal(), which results in wiping out local override String userId = data.getLocalValue(); // will be "" if !data.getIsLocal(), which results in wiping out local override
ISystemRegistryUI sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
sr.updateHost(conn, conn.getSystemType().getName(), conn.getAliasName(), conn.getHostName(), sr.updateHost(conn, conn.getSystemType().getName(), conn.getAliasName(), conn.getHostName(),
conn.getDescription(), userId, whereToUpdate); conn.getDescription(), userId, whereToUpdate);
} }
@ -662,7 +662,7 @@ public class SystemViewConnectionAdapter
{ {
String name = (String)property; String name = (String)property;
IHost conn = (IHost)propertySourceInput; IHost conn = (IHost)propertySourceInput;
ISystemRegistryUI sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistryUI sr = RSEUIPlugin.getTheSystemRegistry();
if (name.equals(ISystemPropertyConstants.P_DEFAULTUSERID)) if (name.equals(ISystemPropertyConstants.P_DEFAULTUSERID))
{ {
@ -707,7 +707,7 @@ public class SystemViewConnectionAdapter
{ {
IHost sysCon = (IHost) element; IHost sysCon = (IHost) element;
if (sysCon.getSystemType().getName().equals(IRSESystemType.SYSTEMTYPE_LOCAL)) return existsMoreThanOneLocalConnection(); if (sysCon.getSystemType().getName().equals(IRSESystemType.SYSTEMTYPE_LOCAL)) return existsMoreThanOneLocalConnection();
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
return !sr.isAnySubSystemConnected((IHost)element); return !sr.isAnySubSystemConnected((IHost)element);
} }
return true; return true;
@ -715,7 +715,7 @@ public class SystemViewConnectionAdapter
protected boolean existsMoreThanOneLocalConnection() protected boolean existsMoreThanOneLocalConnection()
{ {
IHost[] localCons = RSEUIPlugin.getDefault().getSystemRegistry().getHostsBySystemType(IRSESystemType.SYSTEMTYPE_LOCAL); IHost[] localCons = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemType(IRSESystemType.SYSTEMTYPE_LOCAL);
return localCons.length > 1; return localCons.length > 1;
} }
@ -726,7 +726,7 @@ public class SystemViewConnectionAdapter
{ {
boolean ok = true; boolean ok = true;
IHost conn = (IHost)element; IHost conn = (IHost)element;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.deleteHost(conn); sr.deleteHost(conn);
return ok; return ok;
} }
@ -747,7 +747,7 @@ public class SystemViewConnectionAdapter
{ {
boolean ok = true; boolean ok = true;
IHost conn = (IHost)element; IHost conn = (IHost)element;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.renameHost(conn,name); // renames and saves to disk sr.renameHost(conn,name); // renames and saves to disk
return ok; return ok;
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java
View file

@ -82,7 +82,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
if (selection.size() == 1) { if (selection.size() == 1) {
Object element = selection.getFirstElement(); Object element = selection.getFirstElement();
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getSubSystemActions(menu, selection, shell, menuGroup, ssFactory, ss); IAction[] actions = adapter.getSubSystemActions(menu, selection, shell, menuGroup, ssFactory, ss);
@ -107,7 +107,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE GETIMAGEDESCRIPTOR FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE GETIMAGEDESCRIPTOR FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfiguration ssFactory = RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(ss);
if (ssFactory != null) if (ssFactory != null)
{ {
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
@ -176,7 +176,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE GETPARENT FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE GETPARENT FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
return RSEUIPlugin.getDefault().getSystemRegistry().getHost(ss.getSystemProfile(),ss.getHostAliasName()); return RSEUIPlugin.getTheSystemRegistry().getHost(ss.getSystemProfile(),ss.getHostAliasName());
} }
/** /**
@ -649,7 +649,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
//System.out.println("INSIDE DODELETE FOR SUBSYSTEM VIEW ADAPTER: "+element); //System.out.println("INSIDE DODELETE FOR SUBSYSTEM VIEW ADAPTER: "+element);
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.deleteSubSystem(ss); sr.deleteSubSystem(ss);
return true; return true;
} }

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadView.java
View file

@ -821,7 +821,7 @@ public class SystemScratchpadView
*/ */
public boolean doDelete(IProgressMonitor monitor) public boolean doDelete(IProgressMonitor monitor)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();
@ -913,7 +913,7 @@ public class SystemScratchpadView
*/ */
public boolean doRename(String[] newNames) public boolean doRename(String[] newNames)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java
View file

@ -196,7 +196,7 @@ public class RSESystemTypeAdapter extends RSEAdapter {
result = RSEPreferencesManager.getIsSystemTypeEnabled(systemType); result = RSEPreferencesManager.getIsSystemTypeEnabled(systemType);
// if enabled, check if the system type has any registered subsystems. If // if enabled, check if the system type has any registered subsystems. If
// not, this will auto-disable the system type. // not, this will auto-disable the system type.
if (result && RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfigurationsBySystemType(systemType, true).length == 0) { if (result && RSEUIPlugin.getTheSystemRegistry().getSubSystemConfigurationsBySystemType(systemType, true).length == 0) {
result = false; result = false;
} }
} }
@ -303,7 +303,7 @@ public class RSESystemTypeAdapter extends RSEAdapter {
// SystemClearAllPasswordsAction is accepted only if passwords are supported // SystemClearAllPasswordsAction is accepted only if passwords are supported
// by any of the sub systems. // by any of the sub systems.
if (actionClass.equals(SystemClearAllPasswordsAction.class)) { if (actionClass.equals(SystemClearAllPasswordsAction.class)) {
ISystemRegistry registry = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
IConnectorService[] connectorServices = registry.getConnectorServices(host); IConnectorService[] connectorServices = registry.getConnectorServices(host);
boolean passwordsSupported = false; boolean passwordsSupported = false;
for (int i = 0; i < connectorServices.length && passwordsSupported == false; i++) { for (int i = 0; i < connectorServices.length && passwordsSupported == false; i++) {

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java
View file

@ -131,7 +131,7 @@ public class SystemSimpleCopyDialog
//ActionContributionItem[] actionItems = createActionContributionItems(); //ActionContributionItem[] actionItems = createActionContributionItems();
//Composite buttons = createButtonBar(composite_prompts, actionItems); //Composite buttons = createButtonBar(composite_prompts, actionItems);
//RSEUIPlugin.getDefault().getSystemRegistry().addSystemResourceChangeListener(this); //RSEUIPlugin.getTheSystemRegistry().addSystemResourceChangeListener(this);
return composite_prompts; return composite_prompts;
} }
@ -200,7 +200,7 @@ public class SystemSimpleCopyDialog
public boolean close() public boolean close()
{ {
//RSEUIPlugin.getDefault().getSystemRegistry().removeSystemResourceChangeListener(this); //RSEUIPlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
return super.close(); return super.close();
} }
/** /**

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -1404,7 +1404,7 @@ public class SystemTableView
*/ */
public boolean doDelete(IProgressMonitor monitor) public boolean doDelete(IProgressMonitor monitor)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
//int selectedCount = selection.size(); //int selectedCount = selection.size();
@ -1496,7 +1496,7 @@ public class SystemTableView
*/ */
public boolean doRename(String[] newNames) public boolean doRename(String[] newNames)
{ {
SystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IStructuredSelection selection = (IStructuredSelection) getSelection(); IStructuredSelection selection = (IStructuredSelection) getSelection();
Iterator elements = selection.iterator(); Iterator elements = selection.iterator();
Object element = null; Object element = null;

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizard.java
View file

@ -207,7 +207,7 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar
if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) { if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) {
// 2. If the wizard is invoked the 1st time, the default private system profile is the // 2. If the wizard is invoked the 1st time, the default private system profile is the
// default profile. // default profile.
ISystemProfile defaultPrivateProfile = RSEUIPlugin.getDefault().getSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile(); ISystemProfile defaultPrivateProfile = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().getDefaultPrivateSystemProfile();
if (defaultPrivateProfile != null) defaultProfileName = defaultPrivateProfile.getName(); if (defaultPrivateProfile != null) defaultProfileName = defaultPrivateProfile.getName();
if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) { if (defaultProfileName == null || !profileNames.contains(defaultProfileName)) {
// 4. The first non-empty profile from the list of active profiles is the default profile. // 4. The first non-empty profile from the list of active profiles is the default profile.
@ -297,7 +297,7 @@ public class RSEDefaultNewConnectionWizard extends RSEAbstractNewConnectionWizar
if (ok) { if (ok) {
boolean cursorSet = true; boolean cursorSet = true;
setBusyCursor(true); setBusyCursor(true);
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
// if private profile is not null, then we have to rename the private profile // if private profile is not null, then we have to rename the private profile
// with the new profile name // with the new profile name

6
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -1624,7 +1624,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
public void run() public void run()
{ {
getConnectorService().reset(); getConnectorService().reset();
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.connectedStatusChange(_subsystem, false, true, _collapseTree); sr.connectedStatusChange(_subsystem, false, true, _collapseTree);
} }
@ -1664,7 +1664,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
public IStatus runInUIThread(IProgressMonitor monitor) public IStatus runInUIThread(IProgressMonitor monitor)
{ {
final ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); final ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.connectedStatusChange(_subsystem, true, false); sr.connectedStatusChange(_subsystem, true, false);
return Status.OK_STATUS; return Status.OK_STATUS;
} }
@ -2580,7 +2580,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
if (!isConnected() || !supportsConnecting) if (!isConnected() || !supportsConnecting)
{ {
// disconnected but may not have notified viewers (i.e. network problem) // disconnected but may not have notified viewers (i.e. network problem)
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
sr.connectedStatusChange(this, false, true, collapseTree); sr.connectedStatusChange(this, false, true, collapseTree);
return; return;
} }