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

removing some compile warnings

Browse source
This commit is contained in:
David McKnight 2007-01-03 18:58:16 +00:00
parent 32d51439e3
commit b44065158f
63 changed files with 117 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1403,9 +1403,6 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
Item[] newResult = new Item[oldResult.length]; Item[] newResult = new Item[oldResult.length];
Item[] children = null; Item[] children = null;
if (parentItem instanceof Item) { if (parentItem instanceof Item) {
if (oldResult == null)
children = getItems((Item) parentItem);
else
children = oldResult; children = oldResult;
} else } else
children = getChildren(parentItem); children = getChildren(parentItem);

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
View file

@ -28,7 +28,6 @@ import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.ISystemUserIdConstants;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPreferencesManager; import org.eclipse.rse.core.SystemPreferencesManager;
@ -73,7 +72,7 @@ import org.eclipse.ui.dialogs.PropertyPage;
*/ */
public class SystemConnectionForm public class SystemConnectionForm
implements Listener, ISystemUserIdConstants, implements Listener, IRSEUserIdConstants,
SelectionListener, Runnable, IRunnableWithProgress SelectionListener, Runnable, IRunnableWithProgress
{ {
@ -451,7 +450,7 @@ public class SystemConnectionForm
if (!ok || (errorMessage != null)) if (!ok || (errorMessage != null))
{ {
ok = false; ok = false;
if (okPressed) if (okPressed && controlInError != null)
controlInError.setFocus(); controlInError.setFocus();
showErrorMessage(errorMessage); showErrorMessage(errorMessage);
} }
@ -1245,7 +1244,6 @@ public class SystemConnectionForm
{ {
ISystemProfile profile = conn.getSystemProfile(); ISystemProfile profile = conn.getSystemProfile();
Vector v = RSEUIPlugin.getTheSystemRegistry().getHostAliasNames(profile); Vector v = RSEUIPlugin.getTheSystemRegistry().getHostAliasNames(profile);
if (conn != null) // hmm, line 1 of this method will crash if this is the case!
v.removeElement(conn.getAliasName()); v.removeElement(conn.getAliasName());
ValidatorConnectionName connNameValidator = new ValidatorConnectionName(v); ValidatorConnectionName connNameValidator = new ValidatorConnectionName(v);
return connNameValidator; return connNameValidator;

11
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java
View file

@ -1089,9 +1089,12 @@ public class SystemWidgetHelpers {
combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, factoryId, newButton); combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, factoryId, newButton);
else if (factoryCategory != null) else if (factoryCategory != null)
combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, newButton, factoryCategory); combo = new SystemHostCombo(parent, SWT.NULL, defaultConnection, newButton, factoryCategory);
if (listener != null) if (listener != null && combo != null)
combo.addSelectionListener(listener); combo.addSelectionListener(listener);
boolean hasGridData = (combo.getLayoutData() != null) && (combo.getLayoutData() instanceof GridData);
boolean hasGridData = false;
if (combo != null)
hasGridData = (combo.getLayoutData() != null) && (combo.getLayoutData() instanceof GridData);
//System.out.println("history directory griddata non-null? " + hasGridData); //System.out.println("history directory griddata non-null? " + hasGridData);
int minwidth = 250; // todo: tweak this? int minwidth = 250; // todo: tweak this?
if (!hasGridData) { if (!hasGridData) {
@ -1102,13 +1105,17 @@ public class SystemWidgetHelpers {
data.verticalAlignment = GridData.CENTER; data.verticalAlignment = GridData.CENTER;
data.grabExcessVerticalSpace = false; data.grabExcessVerticalSpace = false;
data.horizontalSpan = horizontalSpan; data.horizontalSpan = horizontalSpan;
if (combo != null)
combo.setLayoutData(data); combo.setLayoutData(data);
} else { } else {
if (combo != null)
{
((GridData) combo.getLayoutData()).horizontalSpan = horizontalSpan; ((GridData) combo.getLayoutData()).horizontalSpan = horizontalSpan;
((GridData) combo.getLayoutData()).horizontalAlignment = GridData.FILL; ((GridData) combo.getLayoutData()).horizontalAlignment = GridData.FILL;
((GridData) combo.getLayoutData()).grabExcessHorizontalSpace = true; ((GridData) combo.getLayoutData()).grabExcessHorizontalSpace = true;
((GridData) combo.getLayoutData()).widthHint = minwidth; ((GridData) combo.getLayoutData()).widthHint = minwidth;
} }
}
return combo; return combo;
} }

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

@ -425,7 +425,7 @@ public class SystemBaseAction extends Action implements ISystemAction
//this.previousSelections.add(this.sSelection); //this.previousSelections.add(this.sSelection);
} }
sSelection = (IStructuredSelection)selection; sSelection = (IStructuredSelection)selection;
if (!selectionSensitive || (selection == null)) if (!selectionSensitive)
{ {
if (traceSelections) if (traceSelections)
System.out.println(this.getClass().getName() + ". Returning. selectionSensitive = " + selectionSensitive); //$NON-NLS-1$ System.out.println(this.getClass().getName() + ". Returning. selectionSensitive = " + selectionSensitive); //$NON-NLS-1$

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java
View file

@ -83,6 +83,8 @@ public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction
for (int idx=0; idx<actions.length; idx++) for (int idx=0; idx<actions.length; idx++)
{ {
if (actions[idx] instanceof SystemCascadingRemoteServerBaseAction) if (actions[idx] instanceof SystemCascadingRemoteServerBaseAction)
{
if (conn != null)
{ {
SystemCascadingRemoteServerBaseAction action = (SystemCascadingRemoteServerBaseAction)actions[idx]; SystemCascadingRemoteServerBaseAction action = (SystemCascadingRemoteServerBaseAction)actions[idx];
action.setHost(conn); action.setHost(conn);
@ -93,4 +95,5 @@ public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction
} }
} }
} }
}
} }

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java
View file

@ -39,7 +39,6 @@ import org.eclipse.swt.widgets.Shell;
*/ */
public class SystemCopyConnectionAction extends SystemBaseCopyAction public class SystemCopyConnectionAction extends SystemBaseCopyAction
{ {
private ISystemRegistry sr = null;
private SystemSimpleContentElement initialSelectionElement = null; private SystemSimpleContentElement initialSelectionElement = null;
/** /**
* Constructor for SystemCopyConnectionAction * Constructor for SystemCopyConnectionAction

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemDynamicPopupMenuExtensionManager.java
View file

@ -54,9 +54,8 @@ public class SystemDynamicPopupMenuExtensionManager implements
* Actions are added to a contribution menu. * Actions are added to a contribution menu.
* @param shell the shell * @param shell the shell
* @param menu the menu to contribute to * @param menu the menu to contribute to
* @param selection(s) are processed to determine the resource source file * @param selection are processed to determine the resource source file
* @param menuGroup the default menu group to add actions to * @param menuGroup the default menu group to add actions to
* @return the menu is populated with actions
*/ */
public void populateMenu(Shell shell, SystemMenuManager menu,IStructuredSelection selection, String menuGroup) public void populateMenu(Shell shell, SystemMenuManager menu,IStructuredSelection selection, String menuGroup)
{ {

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java
View file

@ -40,7 +40,6 @@ import org.eclipse.swt.widgets.Shell;
public class SystemMoveConnectionAction extends SystemBaseCopyAction public class SystemMoveConnectionAction extends SystemBaseCopyAction
{ {
private ISystemRegistry sr = null;
private SystemSimpleContentElement initialSelectionElement = null; private SystemSimpleContentElement initialSelectionElement = null;
/** /**

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java
View file

@ -27,7 +27,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemFilterTableDialog.java
View file

@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.TableItem;

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

@ -766,8 +766,8 @@ public abstract class SystemPromptDialog
/** /**
* Explicitly specify if Details Button to be shown. * Explicitly specify if Details Button to be shown.
* There is support to automatically toggle the text. * There is support to automatically toggle the text.
* @param true if the Details button is to be shown * @param show if the Details button is to be shown
* @param true if the button should initially be in "hide mode" versus "hide mode" * @param hideMode if the button should initially be in "hide mode" versus "hide mode"
*/ */
public void setShowDetailsButton(boolean show, boolean hideMode) public void setShowDetailsButton(boolean show, boolean hideMode)
{ {

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

@ -420,7 +420,7 @@ public class SystemRenameDialog extends SystemPromptDialog
//newNames.addElement(newName); //newNames.addElement(newName);
newNames.addElement(canonicalNewName); // defect 42145 newNames.addElement(canonicalNewName); // defect 42145
} }
if ((errMsg != null) && (firstErrMsg == null)) if (errMsg != null)
{ {
firstErrMsg = errMsg; firstErrMsg = errMsg;
firstErrRow = rows[idx]; firstErrRow = rows[idx];

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

@ -212,10 +212,12 @@ public class SystemSimpleCopyDialog
String errMsg = null; String errMsg = null;
Control controlInError = null; Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/*
if (errMsg != null) if (errMsg != null)
controlInError.setFocus(); controlInError.setFocus();
return (errMsg == null); return (errMsg == null);
*/
return true;
} }
/** /**

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

@ -461,10 +461,12 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog
String errMsg = null; String errMsg = null;
Control controlInError = null; Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/*
if (errMsg != null) if (errMsg != null)
controlInError.setFocus(); controlInError.setFocus();
return (errMsg == null); return (errMsg == null);
*/
return true;
} }
/** /**

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java
View file

@ -198,7 +198,6 @@ public abstract class SystemFilterAbstractFilterPoolAction
{ {
ISystemFilterPoolManager[] mgrs = null; ISystemFilterPoolManager[] mgrs = null;
ISystemFilterPoolManagerProvider provider = getFilterPoolManagerProvider(); ISystemFilterPoolManagerProvider provider = getFilterPoolManagerProvider();
if (mgrs == null)
mgrs = dlgInputs.poolManagers; mgrs = dlgInputs.poolManagers;
if ((mgrs==null) && (provider != null)) if ((mgrs==null) && (provider != null))
mgrs = provider.getSystemFilterPoolManagers(); // get it in real time. mgrs = provider.getSystemFilterPoolManagers(); // get it in real time.

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

@ -282,7 +282,7 @@ public class SystemFilterNewFilterPoolWizardDefaultMainPage
errMsg = validateNameInput(); errMsg = validateNameInput();
if (errMsg != null) if (errMsg != null)
controlInError = textName; controlInError = textName;
if (errMsg != null) if (errMsg != null && controlInError != null)
controlInError.setFocus(); controlInError.setFocus();
return (errMsg == null); return (errMsg == null);
} }
@ -328,7 +328,7 @@ public class SystemFilterNewFilterPoolWizardDefaultMainPage
if (iiv != null) if (iiv != null)
{ {
int limit = -1; int limit = -1;
if (iiv != null)
limit = iiv.getMaximumNameLength(); limit = iiv.getMaximumNameLength();
if (limit == -1) if (limit == -1)
limit = ValidatorFilterPoolName.MAX_FILTERPOOLNAME_LENGTH; // default is 50 limit = ValidatorFilterPoolName.MAX_FILTERPOOLNAME_LENGTH; // default is 50

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

@ -356,10 +356,12 @@ public class SystemFilterWorkWithFilterPoolsDialog
String errMsg = null; String errMsg = null;
Control controlInError = null; Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/*
if (errMsg != null) if (errMsg != null)
controlInError.setFocus(); controlInError.setFocus();
return (errMsg == null); return (errMsg == null);
*/
return true;
} }
/** /**
@ -558,6 +560,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
SystemSimpleContentElement cElement = SystemSimpleContentElement cElement =
new SystemSimpleContentElement(pool.getName(), pool, mgrElement, (Vector)null); new SystemSimpleContentElement(pool.getName(), pool, mgrElement, (Vector)null);
cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(pool.getProvider(),pool)); cElement.setImageDescriptor(SystemFilterUIHelpers.getFilterPoolImage(pool.getProvider(),pool));
if (mgrElement != null)
mgrElement.addChild(cElement, 0); mgrElement.addChild(cElement, 0);
tree.refresh(mgrElement); // rebuild whole thing tree.refresh(mgrElement); // rebuild whole thing
tree.setSelection(new StructuredSelection(cElement),true); tree.setSelection(new StructuredSelection(cElement),true);

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemDialogPageMessageLine.java
View file

@ -41,7 +41,6 @@ import org.eclipse.ui.dialogs.PropertyPage;
* It fails to do this properly and is extremely fragile since it depends on knowledge * It fails to do this properly and is extremely fragile since it depends on knowledge
* of the internal structure of eclipse provided windows. * of the internal structure of eclipse provided windows.
* <p>Use SystemMessageLine instead. * <p>Use SystemMessageLine instead.
* @link org.eclipse.rse.core.ui.messages.SystemMessageLine
* *
*/ */
public class SystemDialogPageMessageLine implements ISystemMessageLine, MouseListener { public class SystemDialogPageMessageLine implements ISystemMessageLine, MouseListener {
@ -65,6 +64,8 @@ public class SystemDialogPageMessageLine implements ISystemMessageLine, MouseLis
SystemDialogPageMessageLine msgLine = null; SystemDialogPageMessageLine msgLine = null;
Composite pageContainer = wizardPage.getControl().getParent(); Composite pageContainer = wizardPage.getControl().getParent();
Object pageContainerData = null; Object pageContainerData = null;
// FIXME why does this need to be commented out?
//Object pageContainerData = pageContainer.getData(); //Object pageContainerData = pageContainer.getData();
//System.out.println("pageContainerData = " + pageContainerData); //System.out.println("pageContainerData = " + pageContainerData);
if (pageContainerData == null) { if (pageContainerData == null) {

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

@ -78,7 +78,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement
// Create property page UI // Create property page UI
_form.createContents(parent); _form.createContents(parent);
if (sl != null) if (sl != null && connectorService != null)
{ {
_form.setHostname(connectorService.getHost().getHostName()); _form.setHostname(connectorService.getHost().getHostName());
_form.initValues(sl); _form.initValues(sl);

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

@ -36,7 +36,7 @@ public abstract class ServicesPropertyPage extends SystemBasePropertyPage
protected Control createContentArea(Composite parent) protected Control createContentArea(Composite parent)
{ {
_form = new ServicesForm(getMessageLine()); _form = new ServicesForm(parent.getShell(), getMessageLine());
_form.createContents(parent); _form.createContents(parent);
// init services // init services

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemPropertyResources;
import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;

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

@ -18,8 +18,6 @@ package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterPoolReference; import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java
View file

@ -19,7 +19,6 @@ import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterReference; import org.eclipse.rse.core.filters.ISystemFilterReference;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java
View file

@ -29,7 +29,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener; import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java
View file

@ -322,6 +322,7 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem
if (errMsg != null) if (errMsg != null)
{ {
ok = false; ok = false;
if (controlInError != null)
controlInError.setFocus(); controlInError.setFocus();
setErrorMessage(errMsg); setErrorMessage(errMsg);
} }

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTypeFieldEditor.java
View file

@ -528,7 +528,6 @@ public class SystemTypeFieldEditor extends FieldEditor
RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(matchingType.getAdapter(IRSESystemType.class)); RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(matchingType.getAdapter(IRSESystemType.class));
// update this system type's attributes as per preferences... // update this system type's attributes as per preferences...
if (matchingType!=null)
{ {
adapter.setIsEnabled(matchingType, attr1.equals("true")); //$NON-NLS-1$ adapter.setIsEnabled(matchingType, attr1.equals("true")); //$NON-NLS-1$
if (!attr2.equals("null")) //$NON-NLS-1$ if (!attr2.equals("null")) //$NON-NLS-1$

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

@ -40,7 +40,7 @@ public class ValidatorFilterName
* Constructor accepting a Vector. * Constructor accepting a Vector.
* @param A vector containing list of existing filter names to compare against. * @param A vector containing list of existing filter names to compare against.
* Note that toString() is used to get the string from each item. * Note that toString() is used to get the string from each item.
* @param true if comparisons are to be case sensitive, false if case insensitive. * @param existingList if comparisons are to be case sensitive, false if case insensitive.
*/ */
public ValidatorFilterName(Vector existingList) public ValidatorFilterName(Vector existingList)
{ {
@ -50,7 +50,7 @@ public class ValidatorFilterName
/** /**
* Constructor accepting an Array. * Constructor accepting an Array.
* @param An array containing list of existing strings to compare against. * @param An array containing list of existing strings to compare against.
* @param true if comparisons are to be case sensitive, false if case insensitive. * @param existingList if comparisons are to be case sensitive, false if case insensitive.
*/ */
public ValidatorFilterName(String[] existingList) public ValidatorFilterName(String[] existingList)
{ {

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

@ -37,7 +37,7 @@ public class ValidatorFilterPoolName
* Constructor accepting a Vector. * Constructor accepting a Vector.
* @param A vector containing list of existing filter names to compare against. * @param A vector containing list of existing filter names to compare against.
* Note that toString() is used to get the string from each item. * Note that toString() is used to get the string from each item.
* @param true if comparisons are to be case sensitive, false if case insensitive. * @param existingList if comparisons are to be case sensitive, false if case insensitive.
*/ */
public ValidatorFilterPoolName(Vector existingList) public ValidatorFilterPoolName(Vector existingList)
{ {
@ -47,7 +47,7 @@ public class ValidatorFilterPoolName
/** /**
* Constructor accepting an Array. * Constructor accepting an Array.
* @param An array containing list of existing strings to compare against. * @param An array containing list of existing strings to compare against.
* @param true if comparisons are to be case sensitive, false if case insensitive. * @param existingList if comparisons are to be case sensitive, false if case insensitive.
*/ */
public ValidatorFilterPoolName(String[] existingList) public ValidatorFilterPoolName(String[] existingList)
{ {

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

@ -1151,7 +1151,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
// we want to make sure the order is kept consistent at // we want to make sure the order is kept consistent at
// Copy, Paste, Move, Delete Rename // Copy, Paste, Move, Delete Rename
if (pasteIndex > -1) if (pasteIndex > -1 && ourChildActions != null)
{ {
filterActions[fsIdx++] = (IAction) ourChildActions.elementAt(pasteIndex); filterActions[fsIdx++] = (IAction) ourChildActions.elementAt(pasteIndex);
} }
@ -1188,7 +1188,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
*/ */
IAction[] allFilterActions = new IAction[childActions.size() + filterActions.length]; IAction[] allFilterActions = new IAction[childActions.size() + filterActions.length];
int allIdx = 0; int allIdx = 0;
if (childActions != null)
for (int idx = 0; idx < childActions.size(); idx++) for (int idx = 0; idx < childActions.size(); idx++)
allFilterActions[allIdx++] = (IAction) childActions.elementAt(idx); allFilterActions[allIdx++] = (IAction) childActions.elementAt(idx);
for (int idx = 0; idx < filterActions.length; idx++) for (int idx = 0; idx < filterActions.length; idx++)

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

@ -234,7 +234,7 @@ public class SystemDNDTransferRunnable extends Job
else else
{ {
// special case for filters // special case for filters
if (target instanceof ISystemFilterReference) if (target instanceof ISystemFilterReference && targetSubSystem != null)
{ {
ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration();
if (factory.supportsDropInFilters()) if (factory.supportsDropInFilters())
@ -334,7 +334,7 @@ public class SystemDNDTransferRunnable extends Job
// special case for filters // special case for filters
if (target instanceof ISystemFilterReference) if (target instanceof ISystemFilterReference && targetSubSystem != null)
{ {
ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration();
@ -441,7 +441,7 @@ public class SystemDNDTransferRunnable extends Job
if (targetAdapter.validateDrop(tempObject, target, (targetSubSystem == srcSubSystem))) if (targetAdapter.validateDrop(tempObject, target, (targetSubSystem == srcSubSystem)))
{ {
// special case for filters // special case for filters
if (target instanceof ISystemFilterReference) if (target instanceof ISystemFilterReference && targetSubSystem != null)
{ {
ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration();
if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters()) if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters())
@ -477,7 +477,7 @@ public class SystemDNDTransferRunnable extends Job
{ {
// special case for filters // special case for filters
if (target instanceof ISystemFilterReference) if (target instanceof ISystemFilterReference && targetSubSystem != null)
{ {
ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration();
if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters()) if (factory.supportsDropInFilters() && factory.providesCustomDropInFilters())

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemInheritableTextCellEditor.java
View file

@ -17,7 +17,7 @@
package org.eclipse.rse.ui.view; package org.eclipse.rse.ui.view;
import java.text.MessageFormat; import java.text.MessageFormat;
import org.eclipse.jface.util.Assert; import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.rse.ui.widgets.InheritableEntryField; import org.eclipse.rse.ui.widgets.InheritableEntryField;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPropertySheetForm.java
View file

@ -23,8 +23,6 @@ import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;

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

@ -624,10 +624,13 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
{ {
// this is the first column -- treat it special // this is the first column -- treat it special
name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL; name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL;
if (nameDescriptor != null)
{
propertyId = (String) nameDescriptor.getId(); propertyId = (String) nameDescriptor.getId();
editor = getCellEditor(tree, nameDescriptor); editor = getCellEditor(tree, nameDescriptor);
weight = 200; weight = 200;
} }
}
else else
{ // these columns come from the regular descriptors { // these columns come from the regular descriptors
IPropertyDescriptor descriptor = descriptors[i - 1]; IPropertyDescriptor descriptor = descriptors[i - 1];

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java
View file

@ -25,7 +25,6 @@ import java.util.Map;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
@ -36,8 +35,6 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemAdapterHelpers; import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.model.ISystemContainer; import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor;

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

@ -645,10 +645,13 @@ public class SystemTableView
{ {
// this is the first column -- treat it special // this is the first column -- treat it special
name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL; name = SystemPropertyResources.RESID_PROPERTY_NAME_LABEL;
if (nameDescriptor != null)
{
propertyId = (String) nameDescriptor.getId(); propertyId = (String) nameDescriptor.getId();
editor = getCellEditor(table, nameDescriptor); editor = getCellEditor(table, nameDescriptor);
weight = 200; weight = 200;
} }
}
else else
{ // these columns come from the regular descriptors { // these columns come from the regular descriptors
IPropertyDescriptor descriptor = descriptors[i - 1]; IPropertyDescriptor descriptor = descriptors[i - 1];

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewColumnManager.java
View file

@ -68,7 +68,7 @@ public class SystemTableViewColumnManager
* Gets the property descriptors to display as columns in the table * Gets the property descriptors to display as columns in the table
* The set of descriptors and their order may change depending on user customizations * The set of descriptors and their order may change depending on user customizations
* @param adapter * @param adapter
* @return * @return the visible descriptors
*/ */
public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter) public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter)
{ {
@ -112,6 +112,8 @@ public class SystemTableViewColumnManager
len = uniqueDescriptors.length; len = uniqueDescriptors.length;
} }
IPropertyDescriptor[] customDescriptors = new IPropertyDescriptor[len]; IPropertyDescriptor[] customDescriptors = new IPropertyDescriptor[len];
if (uniqueDescriptors != null)
{
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
String propertyName = history[i]; String propertyName = history[i];
@ -134,6 +136,7 @@ public class SystemTableViewColumnManager
return uniqueDescriptors; return uniqueDescriptors;
} }
} }
}
return customDescriptors; return customDescriptors;
} }
else else

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java
View file

@ -24,8 +24,8 @@ import java.util.Hashtable;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider;

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

@ -1403,9 +1403,6 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
Item[] newResult = new Item[oldResult.length]; Item[] newResult = new Item[oldResult.length];
Item[] children = null; Item[] children = null;
if (parentItem instanceof Item) { if (parentItem instanceof Item) {
if (oldResult == null)
children = getItems((Item) parentItem);
else
children = oldResult; children = oldResult;
} else } else
children = getChildren(parentItem); children = getChildren(parentItem);

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java
View file

@ -150,7 +150,7 @@ public class SystemViewAPIProviderForFilters
ISubSystem ss = fRef.getSubSystem(); ISubSystem ss = fRef.getSubSystem();
ISystemFilterReference sfr = fRef.getParentSystemFilterReferencePool().getExistingSystemFilterReference(ss, newFilter); ISystemFilterReference sfr = fRef.getParentSystemFilterReferencePool().getExistingSystemFilterReference(ss, newFilter);
ISystemViewInputProvider inputProvider = this; ISystemViewInputProvider inputProvider = this;
if ((sfr != null) && (inputProvider != null) && (inputProvider.getViewer()!=null)) if ((sfr != null) && (inputProvider.getViewer()!=null))
{ {
SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); SystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null); SystemResourceChangeEvent event = new SystemResourceChangeEvent(sfr, ISystemResourceChangeEvents.EVENT_SELECT_EXPAND, null);
@ -181,9 +181,11 @@ public class SystemViewAPIProviderForFilters
{ {
String[] filterStrings = referencedFilter.getFilterStrings(); String[] filterStrings = referencedFilter.getFilterStrings();
try try
{
if (nestedFilterReferences != null)
{ {
Object[] allChildren = ss.resolveFilterStrings(filterStrings); Object[] allChildren = ss.resolveFilterStrings(filterStrings);
int nbrNestedFilters = (nestedFilterReferences==null) ? 0: nestedFilterReferences.length; int nbrNestedFilters = nestedFilterReferences.length;
children = new Object[nbrNestedFilters + allChildren.length]; children = new Object[nbrNestedFilters + allChildren.length];
int idx = 0; int idx = 0;
for (idx=0; idx<nbrNestedFilters; idx++) for (idx=0; idx<nbrNestedFilters; idx++)
@ -191,6 +193,7 @@ public class SystemViewAPIProviderForFilters
for (int jdx=0; jdx<allChildren.length; jdx++) for (int jdx=0; jdx<allChildren.length; jdx++)
children[idx++] = allChildren[jdx]; children[idx++] = allChildren[jdx];
} }
}
catch (InterruptedException exc) catch (InterruptedException exc)
{ {
children = new SystemMessageObject[1]; children = new SystemMessageObject[1];

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewCompositeActionGroup.java
View file

@ -15,8 +15,8 @@
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.ui.view; package org.eclipse.rse.ui.view;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.util.Assert;
import org.eclipse.ui.IActionBars; import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionContext; import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.ActionGroup;

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

@ -23,7 +23,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.ISystemUserIdConstants;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemPreferencesManager; import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
@ -57,7 +56,7 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor;
*/ */
public class SystemViewConnectionAdapter public class SystemViewConnectionAdapter
extends AbstractSystemViewAdapter extends AbstractSystemViewAdapter
implements ISystemViewElementAdapter, ISystemUserIdConstants implements ISystemViewElementAdapter, IRSEUserIdConstants
{ {
private SystemNewConnectionFromExistingConnectionAction anotherConnectionAction = null; private SystemNewConnectionFromExistingConnectionAction anotherConnectionAction = null;
//private SystemUpdateConnectionAction updateAction = null; //private SystemUpdateConnectionAction updateAction = null;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewDataDragAdapter.java
View file

@ -24,7 +24,6 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DND;

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -391,7 +391,9 @@ public class SystemViewFilterReferenceAdapter
} }
else else
{ {
int nbrNestedFilters = (nestedFilterReferences == null) ? 0 : nestedFilterReferences.length; if (nestedFilterReferences != null)
{
int nbrNestedFilters = nestedFilterReferences.length;
children = new Object[nbrNestedFilters + allChildren.length]; children = new Object[nbrNestedFilters + allChildren.length];
int idx = 0; int idx = 0;
for (idx = 0; idx < nbrNestedFilters; idx++) for (idx = 0; idx < nbrNestedFilters; idx++)
@ -406,6 +408,7 @@ public class SystemViewFilterReferenceAdapter
} }
} }
} }
}
} }
catch (InterruptedException exc) catch (InterruptedException exc)

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

@ -476,7 +476,7 @@ public class SystemViewForm extends Composite implements ISystemTree
{ {
public void widgetDefaultSelected(SelectionEvent event) public void widgetDefaultSelected(SelectionEvent event)
{ {
}; }
public void widgetSelected(SelectionEvent event) public void widgetSelected(SelectionEvent event)
{ {
Object src = event.getSource(); Object src = event.getSource();
@ -484,7 +484,7 @@ public class SystemViewForm extends Composite implements ISystemTree
processGetListButton(); processGetListButton();
else if (src==refreshButton) else if (src==refreshButton)
processRefreshButton(); processRefreshButton();
}; }
}; };
if (getListButton != null) if (getListButton != null)
getListButton.addSelectionListener(selectionListener); getListButton.addSelectionListener(selectionListener);

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewLabelAndContentProvider.java
View file

@ -26,7 +26,6 @@ import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
@ -38,8 +37,6 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.SystemMessageObject; import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.ISystemResourceChangeListener; import org.eclipse.rse.model.ISystemResourceChangeListener;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.model.IWorkbenchAdapter;

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

@ -315,7 +315,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()); //$NON-NLS-1$ SystemBasePlugin.logInfo("Inside updateTitle. inputObject class type: " + inputObj.getClass().getName()); //$NON-NLS-1$
if (inputObj != null)
{ {
setTitleToolTip(getFrameToolTipText(input)); setTitleToolTip(getFrameToolTipText(input));
String viewName = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$ String viewName = getConfigurationElement().getAttribute("name"); //$NON-NLS-1$

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

@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
@ -43,7 +43,7 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor;
* These are children of SystemConnection objects * These are children of SystemConnection objects
*/ */
public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
implements ISystemViewElementAdapter, ISystemPropertyConstants, ISystemUserIdConstants implements ISystemViewElementAdapter, ISystemPropertyConstants, IRSEUserIdConstants
{ {
protected String translatedType; protected String translatedType;
// for reset property support // for reset property support

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewPage.java
View file

@ -87,11 +87,10 @@ FocusListener
private boolean _querying = false; private boolean _querying = false;
private ISystemViewElementAdapter _adapter; private ISystemViewElementAdapter _adapter;
private Object _inputObject; private Object _inputObject;
private SystemTableTreeView _viewer;
public PollingThread() public PollingThread()
{ {
_viewer = getViewer();
_inputObject = _viewer.getInput(); _inputObject = _viewer.getInput();
_adapter = (ISystemViewElementAdapter)((IAdaptable)_inputObject).getAdapter(ISystemViewElementAdapter.class); _adapter = (ISystemViewElementAdapter)((IAdaptable)_inputObject).getAdapter(ISystemViewElementAdapter.class);
} }

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewProvider.java
View file

@ -20,8 +20,8 @@ import java.util.Hashtable;
import java.util.Map; import java.util.Map;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider;

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

@ -864,7 +864,9 @@ public class SystemSearchViewPart extends ViewPart
} }
// get title to use from adapter // get title to use from adapter
String title = adapter.getText(input); String title = null;
if (adapter != null)
title = adapter.getText(input);
// set the title of the view // set the title of the view
setContentDescription(title); setContentDescription(title);

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

@ -19,7 +19,7 @@ import java.util.Vector;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
@ -39,7 +39,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
*/ */
public class SystemTeamViewCategoryAdapter public class SystemTeamViewCategoryAdapter
extends AbstractSystemViewAdapter extends AbstractSystemViewAdapter
implements ISystemViewElementAdapter, ISystemUserIdConstants implements ISystemViewElementAdapter, IRSEUserIdConstants
{ {
private boolean actionsCreated = false; private boolean actionsCreated = false;

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

@ -1235,8 +1235,10 @@ public class SystemTeamViewPart
else if (o instanceof ISystemProfile) else if (o instanceof ISystemProfile)
handle = "Profile"; //$NON-NLS-1$ handle = "Profile"; //$NON-NLS-1$
else if (o instanceof SystemTeamViewCategoryNode) else if (o instanceof SystemTeamViewCategoryNode)
{
//handle = "Category"; //handle = "Category";
handle = null; // decided not to re-expand past profiles //handle = null; // decided not to re-expand past profiles
}
return handle; return handle;
} }

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

@ -20,7 +20,7 @@ import java.util.Hashtable;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.SystemResourceManager; import org.eclipse.rse.core.SystemResourceManager;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.model.SystemStartHere; import org.eclipse.rse.model.SystemStartHere;
@ -49,7 +49,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
*/ */
public class SystemTeamViewProfileAdapter public class SystemTeamViewProfileAdapter
extends AbstractSystemViewAdapter extends AbstractSystemViewAdapter
implements ISystemViewElementAdapter, ISystemUserIdConstants implements ISystemViewElementAdapter, IRSEUserIdConstants
{ {
private boolean actionsCreated = false; private boolean actionsCreated = false;

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

@ -46,7 +46,7 @@ public class SSLForm extends SystemBaseForm {
/** /**
* Determines whether ssl is checked or not * Determines whether ssl is checked or not
* @return * @return whether ssl alert is checked
*/ */
public boolean isSSLAlertChecked() public boolean isSSLAlertChecked()
@ -66,7 +66,7 @@ public class SSLForm extends SystemBaseForm {
/** /**
* Determines whether non-ssl is checked or not * Determines whether non-ssl is checked or not
* @return * @return whether non ssl alert is checked
*/ */
public boolean isNonSSLAlertChecked() public boolean isNonSSLAlertChecked()
{ {

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java
View file

@ -40,6 +40,7 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
@ -59,9 +60,9 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener
private Text _descriptionVerbage; private Text _descriptionVerbage;
public ServicesForm(ISystemMessageLine msgLine) public ServicesForm(Shell shell, ISystemMessageLine msgLine)
{ {
super(msgLine); super(shell, msgLine);
//_factoryTooltip = //_factoryTooltip =
} }

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java
View file

@ -63,7 +63,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
public Control createContents(Composite parent) public Control createContents(Composite parent)
{ {
_form = new ServicesForm(getMessageLine()); _form = new ServicesForm(parent.getShell(), getMessageLine());
Control control = _form.createContents(parent); Control control = _form.createContents(parent);
ServiceElement[] elements = getServiceElements(); ServiceElement[] elements = getServiceElements();

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java
View file

@ -63,7 +63,6 @@ public class SystemNewConnectionWizard
private IHost currentlySelectedConnection = null; private IHost currentlySelectedConnection = null;
private String[] restrictSystemTypesTo; private String[] restrictSystemTypesTo;
private static String lastProfile = null; private static String lastProfile = null;
private boolean showProfilePageInitially = true;
private IHost _dummyHost; private IHost _dummyHost;
/** /**
@ -129,7 +128,6 @@ public class SystemNewConnectionWizard
SystemStartHere.getSystemProfileManager().getDefaultPrivateSystemProfile(); SystemStartHere.getSystemProfileManager().getDefaultPrivateSystemProfile();
showProfilePageInitially = RSEUIPlugin.getDefault().getShowProfilePageInitially();
/* DKM - I don't think we should force profiles into the faces of users /* DKM - I don't think we should force profiles into the faces of users
* we no longer default to "private" so hopefully this would never be * we no longer default to "private" so hopefully this would never be
* desirable * desirable

8
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRegistry.java
View file

@ -984,7 +984,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
//monitor.subTask(msg); //monitor.subTask(msg);
SystemBasePlugin.logDebugMessage(this.getClass().getName(), msg); SystemBasePlugin.logDebugMessage(this.getClass().getName(), msg);
subsystems = getSubSystems(conns[idx]); // get old subsystems for this connection subsystems = getSubSystems(conns[idx]); // get old subsystems for this connection
if ((subsystems != null) && (subsystems.length > 0)) if ((subsystems != null) && (subsystems.length > 0) && newConns != null)
{ {
for (int jdx = 0; jdx < subsystems.length; jdx++) for (int jdx = 0; jdx < subsystems.length; jdx++)
{ {
@ -1073,7 +1073,7 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
// last step... physically blow away the profile... // last step... physically blow away the profile...
getSystemProfileManager().deleteSystemProfile(profile, true); getSystemProfileManager().deleteSystemProfile(profile, true);
SystemPreferencesManager.getPreferencesManager().setConnectionNamesOrder(); // update preferences order list SystemPreferencesManager.getPreferencesManager().setConnectionNamesOrder(); // update preferences order list
if ((connections != null) && (connections.length > 0)) // defect 42112 if (connections.length > 0) // defect 42112
fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(connections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this)); fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(connections, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this));
fireModelChangeEvent(SYSTEM_RESOURCE_REMOVED, SYSTEM_RESOURCETYPE_PROFILE, profile, null); fireModelChangeEvent(SYSTEM_RESOURCE_REMOVED, SYSTEM_RESOURCETYPE_PROFILE, profile, null);
@ -2058,7 +2058,6 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
if (object != null) if (object != null)
{ {
String[] fileData = (String[]) object; String[] fileData = (String[]) object;
if (fileData != null)
{ {
for (int i = 0; i < fileData.length; i++) for (int i = 0; i < fileData.length; i++)
{ {
@ -2074,12 +2073,9 @@ public class SystemRegistry implements ISystemRegistryUI, ISystemModelChangeEven
if (object != null) if (object != null)
{ {
String textData = (String) object; String textData = (String) object;
if (textData != null)
{
srcObjects.add(textData); srcObjects.add(textData);
} }
} }
}
return srcObjects; return srcObjects;
} }

2
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java
View file

@ -18,10 +18,8 @@ package org.eclipse.rse.core.servicesubsystem;
import java.util.Vector; import java.util.Vector;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.filters.ISystemFilter; import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterPool; import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage; import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.core.subsystems.AbstractConnectorService;
import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager; import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;

3
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
View file

@ -21,7 +21,6 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.core.IRSEUserIdConstants; import org.eclipse.rse.core.IRSEUserIdConstants;
import org.eclipse.rse.core.ISystemUserIdConstants;
import org.eclipse.rse.core.PasswordPersistenceManager; import org.eclipse.rse.core.PasswordPersistenceManager;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
@ -76,7 +75,7 @@ import org.eclipse.ui.PlatformUI;
* *
* @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager
*/ */
public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService, ISystemUserIdConstants public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService, IRSEUserIdConstants
{ {
private ISubSystem _primarySubSystem; private ISubSystem _primarySubSystem;

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

@ -1263,11 +1263,13 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
} }
// server launcher // server launcher
IServerLauncherProperties sl = oldConnectorService.getRemoteServerLauncherProperties(); IServerLauncherProperties sl = null;
if (oldConnectorService != null)
sl = oldConnectorService.getRemoteServerLauncherProperties();
if ((sl != null) && supportsServerLaunchProperties(newConnection)) if ((sl != null) && supportsServerLaunchProperties(newConnection))
{ {
IServerLauncherProperties newSL = createServerLauncher(newConnectorService); IServerLauncherProperties newSL = createServerLauncher(newConnectorService);
if (newSL != null) if (newSL != null && newConnectorService != null)
{ {
newConnectorService.setRemoteServerLauncherProperties(sl.cloneServerLauncher(newSL)); newConnectorService.setRemoteServerLauncherProperties(sl.cloneServerLauncher(newSL));
} }

1
rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemBasePlugin.java
View file

@ -779,7 +779,6 @@ public abstract class SystemBasePlugin extends AbstractUIPlugin
* @param id - an arbitrary ID to assign to this image. Used later when retrieving it. * @param id - an arbitrary ID to assign to this image. Used later when retrieving it.
* @param fileName - the name of the icon file, with extension, relative to this plugin's folder. * @param fileName - the name of the icon file, with extension, relative to this plugin's folder.
* @return the image descriptor for this particular id. * @return the image descriptor for this particular id.
* @see SystemBasePlugin#getImage(String);
*/ */
protected ImageDescriptor putImageInRegistry(String id, String fileName) protected ImageDescriptor putImageInRegistry(String id, String fileName)
{ {

4
rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceListener.java
View file

@ -26,7 +26,6 @@ import org.eclipse.core.resources.IWorkspace;
import org.eclipse.rse.core.model.ISystemModelChangeEvents; import org.eclipse.rse.core.model.ISystemModelChangeEvents;
import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.internal.model.SystemModelChangeEvent; import org.eclipse.rse.internal.model.SystemModelChangeEvent;
import org.eclipse.rse.model.SystemRegistry;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.view.SystemPerspectiveLayout; import org.eclipse.rse.ui.view.SystemPerspectiveLayout;
import org.eclipse.rse.ui.view.SystemView; import org.eclipse.rse.ui.view.SystemView;
@ -53,7 +52,6 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable
private static SystemResourceListener inst = null; private static SystemResourceListener inst = null;
private IProject remoteSystemsProject = null; private IProject remoteSystemsProject = null;
private boolean ignoreEvents = true; private boolean ignoreEvents = true;
;
private boolean ensureEventsOnMode = false; private boolean ensureEventsOnMode = false;
private boolean sawSyncEvent = false; private boolean sawSyncEvent = false;
private boolean changesPending = false; private boolean changesPending = false;
@ -671,7 +669,7 @@ public class SystemResourceListener implements IResourceChangeListener, Runnable
} }
else if (runAction == FIRE_EVENT) else if (runAction == FIRE_EVENT)
{ {
((SystemRegistry)RSEUIPlugin.getTheSystemRegistry()).fireEvent( RSEUIPlugin.getTheSystemRegistry().fireEvent(
new SystemModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ALL_RELOADED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_ALL, "dummy")); //$NON-NLS-1$ new SystemModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_ALL_RELOADED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_ALL, "dummy")); //$NON-NLS-1$
} }