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

regressed no synch queries back - causes hang on dstore query after a connect

Browse source
This commit is contained in:
David McKnight 2006-12-12 15:45:05 +00:00
parent 6c7de1fb07
commit 6ec6762a07
1 changed files with 79 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,13 +71,16 @@ import org.eclipse.ui.progress.WorkbenchJob;
* <li>Storing of tool-specific persistent properties per connection. * <li>Storing of tool-specific persistent properties per connection.
* <li>Accessing of an IConnectorService object to enable the subsystem's connect and disconnect actions. * <li>Accessing of an IConnectorService object to enable the subsystem's connect and disconnect actions.
* <li>Doing actual remote accessing. This usually just involves overriding the <code>internalResolveFilterString</code> methods to * <li>Doing actual remote accessing. This usually just involves overriding the <code>internalResolveFilterString</code> methods to
* populate the remote resources shown when the subsystem's filters are expanded. * populate the remote resources shown when the subsystem's filters are expanded. It might also involve overriding the inherited
* <code>internalRunCommand</code> method if this subsystem supports running commands remotely... although typically such subsystems
* extend {@link ShellServiceSubSystem}, not this class.
* </ol> * </ol>
* <p> * <p>
* This is the base class that subsystem suppliers subclass. * This is the base class that subsystem suppliers subclass, although this is usually done
* by subclassing the child class {@link org.eclipse.rse.core.servicesubsystem.impl.ServiceSubSystem DefaultSubSystemImpl}.<br>
* Each instance of this class represents a subsystem instance for a particular connection. * Each instance of this class represents a subsystem instance for a particular connection.
* <p> * <p>
* When a {@link IHost} is created, this subsystem's factory will be asked to create an * When a {@link org.eclipse.rse.model.SystemConnection SystemConnection} is created, this subsystem's factory will be asked to create an
* instance of its subsystem. If desired, your GUI may also allow users to create additional * instance of its subsystem. If desired, your GUI may also allow users to create additional
* instances. * instances.
* <p> * <p>
@ -85,17 +88,18 @@ import org.eclipse.ui.progress.WorkbenchJob;
* are supplied as empty, so you only override those you want to support). * are supplied as empty, so you only override those you want to support).
* These are required: * These are required:
* <ul> * <ul>
* <li>{@link #getConnectorService()}. * <li>{@link #getSystem()} or, more typically, {@link #getSystemManager()}
* </ul> * </ul>
* These are optional: * These are optional:
* <ul> * <ul>
* <li>{@link #getObjectWithAbsoluteName(String)} * <li>{@link #getObjectWithAbsoluteName(String)}
* <li>{@link #internalResolveFilterString(IProgressMonitor monitor, String filterString)} * <li>{@link #internalResolveFilterString(IProgressMonitor monitor, String filterString)}
* <li>{@link #internalResolveFilterString(IProgressMonitor monitor, Object parent, String filterString)} * <li>{@link #internalResolveFilterString(IProgressMonitor monitor, Object parent, String filterString)}
* <li>{@link #internalGetProperty(IProgressMonitor monitor, Object subject, String key)} * <li>{@link #internalRunCommand(IProgressMonitor monitor, String cmd, Object)}
* <li>{@link #internalSetProperty(IProgressMonitor monitor, Object subject, String key, String value)} * <li>{@link #internalGetProperty(IProgressMonitor monitor, String key)}
* <li>{@link #internalGetProperties(IProgressMonitor monitor, Object subject, String[] keys)} * <li>{@link #internalSetProperty(IProgressMonitor monitor, String key, String value)}
* <li>{@link #internalSetProperties(IProgressMonitor monitor, Object subject, String[] keys, String[] values)} * <li>{@link #internalGetProperties(IProgressMonitor monitor, String[] keys)}
* <li>{@link #internalSetProperties(IProgressMonitor monitor, String[] keys, String[] values)}
* </ul> * </ul>
* *
*/ */
@ -104,7 +108,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
protected static final String SUBSYSTEM_FILE_NAME = "subsystem"; //$NON-NLS-1$ protected static final String SUBSYSTEM_FILE_NAME = "subsystem";
//protected transient SubSystemConfiguration parentFactory = null; //protected transient SubSystemConfiguration parentFactory = null;
protected static final int OPERATION_RESOLVE_ABSOLUTE = 0; protected static final int OPERATION_RESOLVE_ABSOLUTE = 0;
@ -152,6 +156,14 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
protected ISystemFilterPoolReferenceManager filterPoolReferenceManager = null; protected ISystemFilterPoolReferenceManager filterPoolReferenceManager = null;
private class NullRunnableContext implements IRunnableContext {
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
IProgressMonitor monitor = new NullProgressMonitor();
runnable.run(monitor);
}
}
public class SystemMessageDialogRunnable implements Runnable public class SystemMessageDialogRunnable implements Runnable
{ {
private SystemMessageDialog _dlg; private SystemMessageDialog _dlg;
@ -165,12 +177,6 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
_dlg.open(); _dlg.open();
} }
} }
private class NullRunnableContext implements IRunnableContext {
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
IProgressMonitor monitor = new NullProgressMonitor();
runnable.run(monitor);
}
}
protected SubSystem(IHost host, IConnectorService connectorService) protected SubSystem(IHost host, IConnectorService connectorService)
{ {
@ -279,9 +285,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
String msg = "Unexpected error renaming connection-specific filter pool " + getConnectionOwnedFilterPoolName(newName, getHostAliasName()); //$NON-NLS-1$ String msg = "Unexpected error renaming connection-specific filter pool " + getConnectionOwnedFilterPoolName(newName, getHostAliasName());
SystemBasePlugin.logError(msg, exc); SystemBasePlugin.logError(msg, exc);
System.err.println(msg + ": " + exc); //$NON-NLS-1$ System.err.println(msg + ": " + exc);
} }
} }
} }
@ -319,7 +325,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error renaming conection-private pool to: "+newName, exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error renaming conection-private pool to: "+newName, exc);
} }
} }
} }
@ -352,7 +358,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error deleting conection-private pool for: "+getHostAliasName(), exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error deleting conection-private pool for: "+getHostAliasName(), exc);
} }
} }
} }
@ -367,6 +373,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* This is transparent to callers of this method however, as this method resolves from the preferences. * This is transparent to callers of this method however, as this method resolves from the preferences.
* *
* @see org.eclipse.rse.core.model.IHost#getDefaultUserId() * @see org.eclipse.rse.core.model.IHost#getDefaultUserId()
* @see #setUserId(String)
* @see #getLocalUserId() * @see #getLocalUserId()
* @see #clearLocalUserId() * @see #clearLocalUserId()
* @return The value of the UserId attribute * @return The value of the UserId attribute
@ -404,7 +411,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
protected String getPreferencesKey(String profileName, String connectionName) protected String getPreferencesKey(String profileName, String connectionName)
{ {
String key = profileName + "." + connectionName + "." + getName(); //$NON-NLS-1$ //$NON-NLS-2$ String key = profileName + "." + connectionName + "." + getName();
//System.out.println("in SubSystemImpl.getPreferencesKey(): Subsystem key name: " + key); //System.out.println("in SubSystemImpl.getPreferencesKey(): Subsystem key name: " + key);
return key; return key;
} }
@ -436,6 +443,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* @see org.eclipse.rse.core.model.IHost#getDefaultUserId() * @see org.eclipse.rse.core.model.IHost#getDefaultUserId()
* @see #clearLocalUserId() * @see #clearLocalUserId()
* @see #getUserId() * @see #getUserId()
* @see #setUserId(String)
*/ */
public String getLocalUserId() public String getLocalUserId()
{ {
@ -450,6 +458,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* @see org.eclipse.rse.core.model.IHost#getDefaultUserId() * @see org.eclipse.rse.core.model.IHost#getDefaultUserId()
* @see #getUserId() * @see #getUserId()
* @see #getLocalUserId() * @see #getLocalUserId()
* @see #setUserId(String)
*/ */
public void clearLocalUserId() public void clearLocalUserId()
{ {
@ -618,7 +627,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
} catch (Exception exc) { } catch (Exception exc) {
SystemBasePlugin.logError("Error creating connection-private filter pool for connection: " + hostName, exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error creating connection-private filter pool for connection: " + hostName, exc);
} }
} }
return pool; return pool;
@ -711,9 +720,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
for (int idx=0; !would && (idx<strings.length); idx++) for (int idx=0; !would && (idx<strings.length); idx++)
{ {
if (strings[idx].equals("*")) //$NON-NLS-1$ if (strings[idx].equals("*"))
would = true; would = true;
else if (strings[idx].equals("./*")) //$NON-NLS-1$ else if (strings[idx].equals("./*"))
would = true; would = true;
else else
would = doesFilterStringMatch(strings[idx], remoteObjectAbsoluteName, filter.areStringsCaseSensitive()); would = doesFilterStringMatch(strings[idx], remoteObjectAbsoluteName, filter.areStringsCaseSensitive());
@ -840,7 +849,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
IPropertySet set = getPropertySet(vendor); IPropertySet set = getPropertySet(vendor);
if (set == null) if (set == null)
{ {
set = createPropertySet(vendor, ""); //$NON-NLS-1$ set = createPropertySet(vendor, "");
} }
set.addProperty(attributeName, attributeValue); set.addProperty(attributeName, attributeValue);
} }
@ -871,10 +880,10 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
public void setRemoteAttribute(String attributeName, String attributeValue) public void setRemoteAttribute(String attributeName, String attributeValue)
{ {
IPropertySet set = getPropertySet("Remote"); //$NON-NLS-1$ IPropertySet set = getPropertySet("Remote");
if (set == null) if (set == null)
{ {
set = createPropertySet("Remote", getDescription()); //$NON-NLS-1$ set = createPropertySet("Remote", getDescription());
} }
set.addProperty(attributeName, attributeValue); set.addProperty(attributeName, attributeValue);
} }
@ -883,7 +892,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
public String getRemoteAttribute(String attributeName) public String getRemoteAttribute(String attributeName)
{ {
IPropertySet set = getPropertySet("Remote"); //$NON-NLS-1$ IPropertySet set = getPropertySet("Remote");
if (set != null) if (set != null)
{ {
return set.getPropertyValue(attributeName); return set.getPropertyValue(attributeName);
@ -949,7 +958,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
public DisplayErrorMessageJob(Shell shell, SystemMessageException msgExc) public DisplayErrorMessageJob(Shell shell, SystemMessageException msgExc)
{ {
super(""); //$NON-NLS-1$ super("");
this.shell = shell; //FIXME remove this this.shell = shell; //FIXME remove this
this.msgExc = msgExc; this.msgExc = msgExc;
} }
@ -1053,7 +1062,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
getSubSystemConfiguration().saveSubSystem(this); getSubSystemConfiguration().saveSubSystem(this);
RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, newPoolRef, null); RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ADDED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_FILTERPOOLREF, newPoolRef, null);
} catch (Exception exc) { } catch (Exception exc) {
SystemBasePlugin.logError("Error saving subsystem " + getName(), exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem " + getName(), exc);
} }
} }
@ -1079,7 +1088,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error saving subsystem "+getName(),exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem "+getName(),exc);
} }
} }
/** /**
@ -1095,7 +1104,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error saving subsystem "+getName(),exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem "+getName(),exc);
} }
} }
/** /**
@ -1113,7 +1122,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error saving subsystem "+getName(),exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem "+getName(),exc);
} }
} }
/** /**
@ -1134,7 +1143,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error saving subsystem "+getName(),exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem "+getName(),exc);
} }
} }
/** /**
@ -1151,7 +1160,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
catch (Exception exc) catch (Exception exc)
{ {
SystemBasePlugin.logError("Error saving subsystem "+getName(),exc); //$NON-NLS-1$ SystemBasePlugin.logError("Error saving subsystem "+getName(),exc);
} }
} }
// ------------------------------- // -------------------------------
@ -1220,7 +1229,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
public SubSystemOperationJob(String operationName) public SubSystemOperationJob(String operationName)
{ {
super(operationName + " (" + GenericMessages.RSESubSystemOperation_message + ")"); //$NON-NLS-1$ //$NON-NLS-2$ super(operationName + " (" + GenericMessages.RSESubSystemOperation_message + ")");
} }
/** /**
@ -1263,7 +1272,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
String excMsg = e.getMessage(); String excMsg = e.getMessage();
if ((excMsg == null) || (excMsg.length()==0)) if ((excMsg == null) || (excMsg.length()==0))
excMsg = "Exception " + e.getClass().getName(); //$NON-NLS-1$ excMsg = "Exception " + e.getClass().getName();
SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED); SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
sysMsg.makeSubstitution(excMsg); sysMsg.makeSubstitution(excMsg);
return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), e); return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), e);
@ -1300,7 +1309,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
monitor.done(); monitor.done();
String excMsg = exc.getTargetException().getMessage(); String excMsg = exc.getTargetException().getMessage();
if ((excMsg == null) || (excMsg.length()==0)) if ((excMsg == null) || (excMsg.length()==0))
excMsg = "Exception " + exc.getTargetException().getClass().getName(); //$NON-NLS-1$ excMsg = "Exception " + exc.getTargetException().getClass().getName();
return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, excMsg, exc.getTargetException()); return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, excMsg, exc.getTargetException());
} }
catch(Exception exc) catch(Exception exc)
@ -1308,7 +1317,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
monitor.done(); monitor.done();
String excMsg = exc.getMessage(); String excMsg = exc.getMessage();
if ((excMsg == null) || (excMsg.length()==0)) if ((excMsg == null) || (excMsg.length()==0))
excMsg = "Exception " + exc.getClass().getName(); //$NON-NLS-1$ excMsg = "Exception " + exc.getClass().getName();
SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED); SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
sysMsg.makeSubstitution(excMsg); sysMsg.makeSubstitution(excMsg);
return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), exc); return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), exc);
@ -1405,7 +1414,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
// DKM - we shouldn't be using parent context for filter strings because // DKM - we shouldn't be using parent context for filter strings because
// now we have multiple contexts for the same resources // now we have multiple contexts for the same resources
_filterString = "*"; //$NON-NLS-1$ _filterString = "*";
} }
msg = getResolvingMessage(_filterString); msg = getResolvingMessage(_filterString);
@ -1563,7 +1572,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
String excMsg = e.getMessage(); String excMsg = e.getMessage();
if ((excMsg == null) || (excMsg.length() == 0)) excMsg = "Exception " + e.getClass().getName(); //$NON-NLS-1$ if ((excMsg == null) || (excMsg.length() == 0)) excMsg = "Exception " + e.getClass().getName();
SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED); SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
sysMsg.makeSubstitution(getHostName(), excMsg); sysMsg.makeSubstitution(getHostName(), excMsg);
result = new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), e); result = new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, sysMsg.getLevelOneText(), e);
@ -1726,18 +1735,18 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
SystemMessage msg = null; SystemMessage msg = null;
if (exc instanceof SystemMessageException) if (exc instanceof SystemMessageException)
{ {
SystemBasePlugin.logError("Connection error", exc); //$NON-NLS-1$ SystemBasePlugin.logError("Connection error", exc);
msg = ((SystemMessageException) exc).getSystemMessage(); msg = ((SystemMessageException) exc).getSystemMessage();
} }
else if (exc instanceof java.net.UnknownHostException) else if (exc instanceof java.net.UnknownHostException)
{ {
SystemBasePlugin.logError("Connection error", exc); //$NON-NLS-1$ SystemBasePlugin.logError("Connection error", exc);
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
msg.makeSubstitution(hostName); msg.makeSubstitution(hostName);
} }
else else
{ {
SystemBasePlugin.logError("Connection error", exc); //$NON-NLS-1$ SystemBasePlugin.logError("Connection error", exc);
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED); msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_FAILED);
msg.makeSubstitution(hostName, exc); msg.makeSubstitution(hostName, exc);
} }
@ -1853,7 +1862,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{ {
String excMsg = exc.getMessage(); String excMsg = exc.getMessage();
if ((excMsg == null) || (excMsg.length()==0)) if ((excMsg == null) || (excMsg.length()==0))
excMsg = "Exception " + exc.getClass().getName(); //$NON-NLS-1$ excMsg = "Exception " + exc.getClass().getName();
sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED); sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
sysMsg.makeSubstitution(excMsg); sysMsg.makeSubstitution(excMsg);
@ -1982,7 +1991,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* displaying for you. Just override internalResolveFilterString.</b> * displaying for you. Just override internalResolveFilterString.</b>
* <p> * <p>
* @param filterString filter pattern for objects to return. * @param filterString filter pattern for objects to return.
* @return the results of resolving the filter string. * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
*/ */
public Object[] resolveFilterString(String filterString) public Object[] resolveFilterString(String filterString)
throws Exception throws Exception
@ -2021,22 +2030,25 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!");
return null; return null;
} }
/** /**
* Resolve multiple absolute filter strings. This is only applicable if the subsystem * Resolve multiple absolute filter strings. This is only applicable if the subsystem
* factory reports true for supportsFilters(). * factory reports true for supportsFilters().
* <p> * <p>
* This is the same as {@link #resolveFilterString(String)} but takes an array of * This is the same as {@link #resolveFilterString(String,Shell)} but takes an array of
* filter strings versus a single filter string. * filter strings versus a single filter string.
* <p> * <p>
* The default implementation of this simply calls {@link #internalResolveFilterStrings(IProgressMonitor, String[])}. * The default implementation of this simply calls {@link #resolveFilterString(String,Shell)}
* once for each filter string, and concatenates the result. The method sortResolvedFilterStringObject
* is called on the concatenated result, given subclasses an opportunity to sort the result.
* <p> * <p>
* After successful resolve, the sort method is called to sort the concatenated results before * After successful resolve, the sort method is called to sort the concatenated results before
* returning them. * returning them.
* *
* @param filterStrings array of filter patterns for objects to return. * @param filterStrings array of filter patterns for objects to return.
* @param Shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Array of objects that are the result of resolving all the filter strings * @return Array of objects that are the result of resolving all the filter strings
*/ */
public Object[] resolveFilterStrings(String[] filterStrings) public Object[] resolveFilterStrings(String[] filterStrings)
@ -2046,7 +2058,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
boolean ok = true; boolean ok = true;
if ((filterStrings == null) || (filterStrings.length == 0)) { if ((filterStrings == null) || (filterStrings.length == 0)) {
SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$ SystemBasePlugin.logInfo("Filter strings are null");
return null; return null;
} }
@ -2085,7 +2097,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.resolveFilterString: isConnected() returning false!");
return null; return null;
} }
@ -2340,7 +2352,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "in SubSystemImpl.resolveFilterString: isConnected() returning false!"); //$NON-NLS-1$ SystemBasePlugin.logDebugMessage(this.getClass().getName(), "in SubSystemImpl.resolveFilterString: isConnected() returning false!");
return null; return null;
} }
@ -2393,7 +2405,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
System.out.println("in SubSystemImpl.setProperty: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.setProperty: isConnected() returning false!");
return null; return null;
} }
@ -2432,7 +2444,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
System.out.println("in SubSystemImpl.getProperty: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.getProperty: isConnected() returning false!");
return null; return null;
} }
@ -2440,9 +2452,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* Set multiple remote properties. Subsystems interpret as they wish. Eg, this might be to set * Set multiple remote properties. Subsystems interpret as they wish. Eg, this might be to set
* a number of remote environment variables. This is only applicable if the subsystem factory reports * a number of remote environment variables. This is only applicable if the subsystem factory reports
* true for supportsProperties(). * true for supportsProperties().
* @param subject identifies which object to get the properties of. * @param subject Identifies which object to get the properties of
* @param keys the array of propertie keys to set. * @param key Identifies property to set
* @param values the array of values to set. The value at a certain index corresponds to the property key at the same index. * @param value Values to set properties to. One to one mapping to keys by index number
* @return Object interpretable by subsystem. Might be a Boolean, or the might be new values for confirmation. * @return Object interpretable by subsystem. Might be a Boolean, or the might be new values for confirmation.
*/ */
public Object setProperties(Object subject, String[] keys, String[] values) public Object setProperties(Object subject, String[] keys, String[] values)
@ -2471,7 +2483,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
} }
} }
else else
System.out.println("in SubSystemImpl.setProperties: isConnected() returning false!"); //$NON-NLS-1$ System.out.println("in SubSystemImpl.setProperties: isConnected() returning false!");
return null; return null;
} }
@ -2672,8 +2684,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* a remote environment variable. This is only applicable if the subsystem factory reports * a remote environment variable. This is only applicable if the subsystem factory reports
* true for supportsProperties(). * true for supportsProperties().
* @param subject Identifies which object to get the properties of * @param subject Identifies which object to get the properties of
* @param keys the array of property keys. * @param key Identifies property to get value of
* @return the values for the given property keys. * @return Object The values of the requested keys.
*/ */
public String[] getProperties(Object subject, String[] keys) public String[] getProperties(Object subject, String[] keys)
throws Exception throws Exception
@ -2880,10 +2892,10 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* Resolve multiple absolute filter strings. This is only applicable if the subsystem * Resolve multiple absolute filter strings. This is only applicable if the subsystem
* factory reports true for supportsFilters(). * factory reports true for supportsFilters().
* <p> * <p>
* This is the same as {@link #internalResolveFilterString(IProgressMonitor, Object, String)} but takes an array of * This is the same as {@link #resolveFilterString(String,Shell)} but takes an array of
* filter strings versus a single filter string. * filter strings versus a single filter string.
* <p> * <p>
* The default implementation of this simply calls {@link #internalResolveFilterString(IProgressMonitor, String)} * The default implementation of this simply calls {@link #resolveFilterString(String,Shell)}
* once for each filter string, and concatenates the result. The method sortResolvedFilterStringObject * once for each filter string, and concatenates the result. The method sortResolvedFilterStringObject
* is called on the concatenated result, given subclasses an opportunity to sort the result. * is called on the concatenated result, given subclasses an opportunity to sort the result.
* <p> * <p>
@ -2978,7 +2990,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/ */
protected String getFirstParentFilterString(Object parent) protected String getFirstParentFilterString(Object parent)
{ {
return "*"; //$NON-NLS-1$ return "*";
} }
@ -3073,7 +3085,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
// for wizards and dialogs use the specified context that was placed in the registry // for wizards and dialogs use the specified context that was placed in the registry
IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext(); IRunnableContext irc = RSEUIPlugin.getTheSystemRegistry().getRunnableContext();
if (irc != null) { if (irc != null) {
SystemBasePlugin.logInfo("Got runnable context from system registry"); //$NON-NLS-1$ SystemBasePlugin.logInfo("Got runnable context from system registry");
return irc; return irc;
} else { } else {
// for other cases, use statusbar // for other cases, use statusbar
@ -3081,7 +3093,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
if (win != null) { if (win != null) {
Shell winShell = getActiveWorkbenchShell(); Shell winShell = getActiveWorkbenchShell();
if (winShell != null && !winShell.isDisposed() && winShell.isVisible()) { if (winShell != null && !winShell.isDisposed() && winShell.isVisible()) {
SystemBasePlugin.logInfo("Using active workbench window as runnable context"); //$NON-NLS-1$ SystemBasePlugin.logInfo("Using active workbench window as runnable context");
shell = winShell; shell = winShell;
return win; return win;
//dwd } else { //dwd } else {