mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00
Code Issues Wiki Activity

[cleanup] Remove "implements" use of ISystemMessages

Browse source
This commit is contained in:
Martin Oberhuber 2006-08-25 11:45:38 +00:00
parent f3168a3023
commit 10bed6d007
92 changed files with 243 additions and 337 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.Shell;
*/
public abstract class SystemBaseForm
implements Listener, ISystemConnectionWizardErrorUpdater //, ISystemMessages
implements Listener, ISystemConnectionWizardErrorUpdater //
{
private ISystemMessageLine msgLine;

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

@ -72,7 +72,7 @@ import org.eclipse.ui.dialogs.PropertyPage;
*/
public class SystemConnectionForm
implements Listener, ISystemMessages, ISystemUserIdConstants,
implements Listener, ISystemUserIdConstants,
SelectionListener, Runnable, IRunnableWithProgress
{
@ -411,7 +411,7 @@ public class SystemConnectionForm
if (currentHostName.length() > 0)
{
if (verifyingHostName == null) {
verifyingHostName = RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_VERIFYING);
verifyingHostName = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_VERIFYING);
}
try
@ -427,7 +427,7 @@ public class SystemConnectionForm
catch (InvocationTargetException e)
{
// error found
errorMessage = RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_NOTFOUND);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_NOTFOUND);
errorMessage.makeSubstitution(currentHostName);
controlInError = textHostName;
}
@ -876,7 +876,7 @@ public class SystemConnectionForm
if (!verifyHostNameCB.getSelection()) {
// clear host name not valid or not found error message so that wizard next page is enabled
if (errorMessage != null && errorMessage == RSEUIPlugin.getPluginMessage(MSG_HOSTNAME_NOTFOUND)) {
if (errorMessage != null && errorMessage == RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_HOSTNAME_NOTFOUND)) {
errorMessage = null;
if (msgLine != null) {
@ -1164,7 +1164,7 @@ public class SystemConnectionForm
if (hostValidator != null)
errorMessage= hostValidator.validate(hostName);
else if (getHostName().length() == 0)
errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_HOSTNAME_EMPTY);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_HOSTNAME_EMPTY);
if (updateMode && !userPickedVerifyHostnameCB)
{
boolean hostNameChanged = !hostName.equals(defaultHostName);
@ -1189,7 +1189,7 @@ public class SystemConnectionForm
if (userIdValidator != null)
errorMessage= userIdValidator.validate(textUserId.getText());
else if (getDefaultUserId().length()==0)
errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_EMPTY);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY);
}
showErrorMessage(errorMessage);
setPageComplete();
@ -1297,7 +1297,7 @@ public class SystemConnectionForm
pm.beginTask(verifyingHostName.getLevelOneText(),IProgressMonitor.UNKNOWN);
try
{
InetAddress address = InetAddress.getByName(currentHostName);
InetAddress.getByName(currentHostName);
}
catch (java.net.UnknownHostException exc)
{

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

@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Text;
*/
public class SystemProfileForm
implements Listener, ISystemMessages
implements Listener
{
// GUI widgets

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

@ -22,7 +22,6 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.internal.model.SystemRegistry;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.widgets.InheritableEntryField;
import org.eclipse.rse.ui.widgets.SystemHistoryCombo;

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

@ -28,7 +28,6 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java
View file

@ -49,7 +49,7 @@ import org.eclipse.ui.PlatformUI;
* child classes.
*/
public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
implements ISystemMessages, IRunnableWithProgress, ISystemCopyTargetSelectionCallback
implements IRunnableWithProgress, ISystemCopyTargetSelectionCallback
{
protected ISystemProfileManager mgr;
protected ISystemRegistry sr;
@ -342,9 +342,9 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
protected SystemMessage getCopyingMessage()
{
if (mode == MODE_COPY)
return RSEUIPlugin.getPluginMessage(MSG_COPYGENERIC_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYGENERIC_PROGRESS);
else
return RSEUIPlugin.getPluginMessage(MSG_MOVEGENERIC_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEGENERIC_PROGRESS);
}
/**
* Get the specific "Copying %1..." or "Moving %1..." message
@ -353,9 +353,9 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
{
SystemMessage msg = null;
if (mode == MODE_COPY)
msg = RSEUIPlugin.getPluginMessage(MSG_COPYTHINGGENERIC_PROGRESS);
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYTHINGGENERIC_PROGRESS);
else
msg = RSEUIPlugin.getPluginMessage(MSG_MOVETHINGGENERIC_PROGRESS);
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVETHINGGENERIC_PROGRESS);
msg.makeSubstitution(oldName);
return msg;
}
@ -404,7 +404,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
msg = exc.getClass().getName();
SystemMessageDialog msgDlg =
new SystemMessageDialog(shell,
RSEUIPlugin.getPluginMessage(MSG_OPERATION_FAILED).makeSubstitution(msg));
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(msg));
msgDlg.setException(exc);
msgDlg.open();
//RSEUIPlugin.logError("Copy/Move operation failed",exc);
@ -431,7 +431,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
*/
protected void showOperationCancelledMessage(Shell shell)
{
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_CANCELLED));
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED));
msgDlg.open();
}

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

@ -21,7 +21,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -32,7 +31,6 @@ import org.eclipse.swt.widgets.Shell;
* This is the action for clearing in-memory userId and password cache
*/
public class SystemClearPasswordAction extends SystemBaseAction
implements ISystemMessages
{
/**

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

@ -19,7 +19,6 @@ package org.eclipse.rse.ui.actions;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -31,7 +30,6 @@ import org.eclipse.swt.widgets.Shell;
* This is the action for connecting to the remote subsystem
*/
public class SystemConnectAction extends SystemBaseAction
implements ISystemMessages
{
/**
* Constructor.

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

@ -24,7 +24,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -33,7 +32,6 @@ import org.eclipse.swt.widgets.Shell;
* This is the action for connecting all subsystems for a given connection.
*/
public class SystemConnectAllSubSystemsAction extends SystemBaseAction
implements ISystemMessages
{
private ISystemRegistry sr = null;

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

@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Shell;
* Copy a connection action.
*/
public class SystemCopyConnectionAction extends SystemBaseCopyAction
implements ISystemMessages
{
private ISystemRegistry sr = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -65,7 +64,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry();
ISystemProfile prevProfile = null;
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e= selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -119,7 +118,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
throws Exception
{
IHost oldConnection = (IHost)oldObject;
String oldName = oldConnection.getAliasName();
//String oldName = oldConnection.getAliasName();
//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName);
ISystemProfile targetProfile = (ISystemProfile)targetContainer;
IHost newConn = sr.copyHost(monitor, oldConnection, targetProfile, newName);
@ -153,14 +152,14 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_COPYCONNECTIONS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTIONS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_COPYCONNECTION_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYCONNECTION_PROGRESS).makeSubstitution(oldName);
}
/**
@ -188,7 +187,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
*/
protected IHost[] getSelectedConnections()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
IHost[] conns = new IHost[selection.size()];
Iterator i = selection.iterator();
int idx=0;

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java
View file

@ -25,7 +25,6 @@ import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
@ -47,7 +46,7 @@ import org.eclipse.ui.part.PluginTransferData;
/**
* Copy selected objects to clipboard action.
*/
public class SystemCopyToClipboardAction extends SystemBaseAction implements ISystemMessages, IValidatorRemoteSelection
public class SystemCopyToClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection
{
@ -201,7 +200,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IS
public boolean updateSelection(IStructuredSelection selection)
{
boolean enable = true;
Iterator e = ((IStructuredSelection) selection).iterator();
Iterator e = selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();

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

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.actions;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -29,7 +28,6 @@ import org.eclipse.swt.widgets.Shell;
* This is the action for disconnecting from a remote subsystem.
*/
public class SystemDisconnectAction extends SystemBaseAction
implements ISystemMessages
{
/**

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

@ -19,7 +19,6 @@ package org.eclipse.rse.ui.actions;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -29,7 +28,6 @@ import org.eclipse.swt.widgets.Shell;
* This is the action forconnecting all subsystems for a given connection.
*/
public class SystemDisconnectAllSubSystemsAction extends SystemBaseAction
implements ISystemMessages
{
private ISystemRegistry sr = null;

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

@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Shell;
* Move a connection action.
*/
public class SystemMoveConnectionAction extends SystemBaseCopyAction
implements ISystemMessages
{
private ISystemRegistry sr = null;
@ -69,7 +68,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
return false;
boolean enable = true;
ISystemProfile prevProfile = null;
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e= selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -123,7 +122,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
throws Exception
{
IHost oldConnection = (IHost)oldObject;
String oldName = oldConnection.getAliasName();
//String oldName = oldConnection.getAliasName();
//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"starting to copy "+oldName+" to "+newName);
ISystemProfile targetProfile = (ISystemProfile)targetContainer;
IHost newConn = sr.moveHost(monitor, oldConnection, targetProfile, newName);
@ -157,14 +156,14 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_MOVECONNECTIONS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTIONS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_MOVECONNECTION_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVECONNECTION_PROGRESS).makeSubstitution(oldName);
}
/**
@ -192,7 +191,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
*/
protected IHost[] getSelectedConnections()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
IHost[] conns = new IHost[selection.size()];
Iterator i = selection.iterator();
int idx=0;

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

@ -16,7 +16,6 @@
package org.eclipse.rse.ui.actions;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.ISystemPromptableObject;

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

@ -30,7 +30,6 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
@ -51,7 +50,7 @@ import org.eclipse.ui.part.ResourceTransfer;
/**
* Paste resources in system clipboard to the selected resource action.
*/
public class SystemPasteFromClipboardAction extends SystemBaseAction implements ISystemMessages, IValidatorRemoteSelection
public class SystemPasteFromClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection
{
@ -241,7 +240,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements
if (hasSource())
{
boolean enable = true;
Iterator e = ((IStructuredSelection) selection).iterator();
Iterator e = selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java
View file

@ -46,7 +46,7 @@ import org.eclipse.ui.PlatformUI;
* We must first prompt user for a new name for the copied profile.
*/
public class SystemProfileNameCopyAction extends SystemBaseDialogAction
implements ISystemMessages, IRunnableWithProgress
implements IRunnableWithProgress
{
private ISystemProfile profile, newProfile;
private ISystemProfileManager mgr;
@ -180,7 +180,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
*/
public static String getCopyingMessage(String oldName, String newName)
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(MSG_COPY_PROGRESS);
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPY_PROGRESS);
msg.makeSubstitution(oldName,newName);
return msg.getLevelOneText();
}
@ -205,7 +205,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
*/
protected void showOperationErrorMessage(Shell shell, Throwable exc)
{
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_FAILED).makeSubstitution(exc.getMessage()));
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED).makeSubstitution(exc.getMessage()));
msgDlg.open();
SystemBasePlugin.logError("Copy profile operation failed",exc);
}
@ -216,7 +216,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
*/
protected void showOperationCancelledMessage(Shell shell)
{
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(MSG_OPERATION_CANCELLED));
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED));
msgDlg.open();
}

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

@ -16,7 +16,6 @@
package org.eclipse.rse.ui.actions;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -28,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
* within the Remote Servers cascading menu.
*/
public class SystemRemoteServerStartAction extends SystemBaseAction
implements ISystemMessages
{
private SystemCascadingRemoteServerBaseAction parentAction;

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

@ -16,7 +16,6 @@
package org.eclipse.rse.ui.actions;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@ -28,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
* within the Remote Servers cascading menu.
*/
public class SystemRemoteServerStopAction extends SystemBaseAction
implements ISystemMessages
{
private SystemCascadingRemoteServerBaseAction parentAction;

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

@ -24,8 +24,6 @@ import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PlatformUI;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java
View file

@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -39,7 +38,7 @@ import org.eclipse.swt.widgets.Text;
* Dialog for copying a system profile.
*/
public class SystemCopyProfileDialog extends SystemPromptDialog
implements ISystemMessages, ISystemPropertyConstants
implements ISystemPropertyConstants
{
private Text newName;
private Button makeActiveCB;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java
View file

@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -55,7 +54,7 @@ import org.eclipse.swt.widgets.TableColumn;
* @see org.eclipse.rse.ui.actions.SystemCommonDeleteAction
*/
public class SystemDeleteDialog extends SystemPromptDialog
implements ISystemMessages, ISystemPropertyConstants,
implements ISystemPropertyConstants,
ISelectionChangedListener
{
private String warningMessage, warningTip;

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

@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Map;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;

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

@ -86,7 +86,7 @@ import org.eclipse.swt.widgets.Text;
* @see org.eclipse.rse.ui.actions.SystemCommonRenameAction
*/
public class SystemRenameDialog extends SystemPromptDialog
implements ISystemMessages, ISystemPropertyConstants,
implements ISystemPropertyConstants,
ISelectionChangedListener,
TraverseListener,
ICellEditorListener, Runnable, FocusListener
@ -390,11 +390,11 @@ public class SystemRenameDialog extends SystemPromptDialog
String canonicalNewName = rows[idx].getCanonicalNewName(); // defect 42145
//if (oldName.equalsIgnoreCase(newName)) // does not consider case for linux or unix or quoted names on iseries
if (rows[idx].newNameEqualsOldName())
errMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(oldName);
errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(oldName);
//errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_OLDEQUALSNEW),SystemMessage.MSG_SUB1,newName);
//else if (newNames.contains(newName)) defect 42145
else if (newNames.contains(canonicalNewName))
errMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_NOTUNIQUE).makeSubstitution(newName);
errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_NOTUNIQUE).makeSubstitution(newName);
//errMsg = SystemMessage.sub(RSEUIPlugin.getString(MSG_VALIDATE_RENAME_NOTUNIQUE),SystemMessage.MSG_SUB1,newName);
else
{
@ -630,8 +630,8 @@ public class SystemRenameDialog extends SystemPromptDialog
if ((names != null) && (names.length>0))
{
uniqueNameValidator = new ValidatorUniqueString(names,caseSensitive);
uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
uniqueNameValidatorPerParent.put(parentName, uniqueNameValidator);
if (debug)
{

20
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
View file

@ -73,7 +73,7 @@ import org.eclipse.swt.widgets.Widget;
* @see org.eclipse.rse.ui.actions.SystemCommonRenameAction
*/
public class SystemRenameSingleDialog extends SystemPromptDialog
implements ISystemMessages, ISystemPropertyConstants,
implements ISystemPropertyConstants,
Runnable
{
@ -230,13 +230,13 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
{
// VERBAGE
verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns);
Label filler = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns);
SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
}
else if (description != null)
{
// VERBAGE
verbageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns);
Label filler = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns);
SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
}
if (copyCollisionMode)
@ -344,9 +344,9 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
if ((nameValidator == null) && (adapter != null))
nameValidator = adapter.getNameValidator(inputElement);
if ((nameValidator != null) && (nameValidator instanceof ISystemValidator))
if (nameValidator != null)
{
int maxLen = ((ISystemValidator)nameValidator).getMaximumNameLength();
int maxLen = nameValidator.getMaximumNameLength();
if (maxLen != -1)
newName.setTextLimit(maxLen);
}
@ -424,8 +424,8 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
if ((names != null) && (names.length>0))
{
uniqueNameValidator = new ValidatorUniqueString(names,caseSensitive);
uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
uniqueNameValidator.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
if (debug)
{
System.out.println("Name validator set. Names = ");
@ -595,18 +595,18 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
if (theNewName == null)
{
errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY);
}
else
{
if (nameValidator != null)
errorMessage= nameValidator.validate(theNewName);
else if (theNewName.length() == 0)
errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY);
if (errorMessage == null)
{
if (adapter != null && adapter.namesAreEqual(inputElement, theNewName))
errorMessage = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName);
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName);
}
}

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

@ -22,7 +22,6 @@ import java.util.Map;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;

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

@ -19,10 +19,8 @@ package org.eclipse.rse.ui.dialogs;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.ISystemPageCompleteListener;
import org.eclipse.rse.ui.SystemBaseForm;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
import org.eclipse.rse.ui.widgets.SystemSelectConnectionForm;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@ -213,7 +211,7 @@ public class SystemSelectConnectionDialog
{
if (getOutputObject() instanceof Object[])
return (Object[])getOutputObject();
else if (getOutputObject() instanceof Object)
else if (getOutputObject() != null)
return new Object[] {getOutputObject()};
else
return null;

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

@ -19,9 +19,7 @@ import java.util.Hashtable;
import java.util.Map;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;

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

@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.actions.ISystemCopyTargetSelectionCallback;
@ -39,7 +38,7 @@ import org.eclipse.swt.widgets.Tree;
*/
public class SystemSimpleCopyDialog
extends SystemPromptDialog
implements ISystemMessages, //ISystemPropertyConstants,
implements //ISystemPropertyConstants,
ISelectionChangedListener
{
private String promptString;

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

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.filters.actions;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;

16
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java
View file

@ -32,7 +32,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -44,7 +43,6 @@ import org.eclipse.swt.widgets.Shell;
* Copy a filter action.
*/
public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -90,7 +88,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e = selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -144,7 +142,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
Object targetContainer, Object oldObject, String oldName)
{
ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
String newName = oldName;
ISystemFilter match = newPool.getSystemFilter(oldName);
if (match != null)
@ -171,7 +169,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
ISystemFilterPool oldFilterPool = oldFilter.getParentFilterPool();
ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
ISystemFilter newFilter = oldMgr.copySystemFilter(newPool, oldFilter, newName);
@ -220,14 +218,14 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage(String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTER_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTER_PROGRESS).makeSubstitution(oldName);
}
/**
@ -255,7 +253,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
*/
protected ISystemFilter[] getSelectedFilters()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
ISystemFilter[] filters = new ISystemFilter[selection.size()];
Iterator i = selection.iterator();
int idx=0;
@ -348,7 +346,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
Vector elements,
SystemSimpleContentElement parentElement)
{
String mgrName = mgr.getName();
//String mgrName = mgr.getName();
ISystemFilterPool[] pools = mgr.getSystemFilterPools();
for (int idx=0; idx<pools.length; idx++)
{

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java
View file

@ -31,7 +31,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -42,7 +41,6 @@ import org.eclipse.swt.widgets.Shell;
* Copy a filter pool action.
*/
public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -87,7 +85,7 @@ public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e= selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -202,21 +200,21 @@ public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERPOOLS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOLS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage(String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERPOOL_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOL_PROGRESS).makeSubstitution(oldName);
}
/**
* Return complete message
*/
public SystemMessage getCompletionMessage(Object targetContainer, String[] oldNames, String[] newNames)
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());
}
/**
@ -244,7 +242,7 @@ public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
*/
protected ISystemFilterPool[] getSelectedFilterPools()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
ISystemFilterPool[] filterPools = new ISystemFilterPool[selection.size()];
Iterator i = selection.iterator();
int idx=0;

16
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java
View file

@ -33,7 +33,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -47,7 +46,6 @@ import org.eclipse.swt.widgets.Shell;
* Copy a filter string action.
*/
public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -104,7 +102,7 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e = selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -175,7 +173,7 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
ISystemFilterString match = newFilter.getSystemFilterString(oldName);
if (match != null)
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
msg.makeSubstitution(oldName, newFilter.getName());
SystemMessageDialog.displayErrorMessage(shell, msg);
}
@ -192,8 +190,8 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
ISystemFilter newFilter = (ISystemFilter)targetContainer;
if (supportsDuplicateFilterStrings(newFilter))
return oldName;
ISystemFilterPool newPool = newFilter.getParentFilterPool();
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPool newPool = newFilter.getParentFilterPool();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
String newName = oldName;
ISystemFilterString match = newFilter.getSystemFilterString(oldName);
if (match != null)
@ -269,14 +267,14 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERSTRINGS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERSTRINGS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_COPYFILTERSTRING_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COPYFILTERSTRING_PROGRESS).makeSubstitution(oldName);
}
/**
@ -307,7 +305,7 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
{
if (strings == null)
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
strings = new ISystemFilterString[selection.size()];
Iterator i = selection.iterator();
int idx=0;

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java
View file

@ -32,7 +32,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -44,7 +43,6 @@ import org.eclipse.swt.widgets.Shell;
* Copy a filter action.
*/
public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -90,7 +88,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e= selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -145,7 +143,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
Object targetContainer, Object oldObject, String oldName)
{
ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
String newName = oldName;
ISystemFilter match = newPool.getSystemFilter(oldName);
if (match != null)
@ -172,7 +170,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
ISystemFilterPool oldFilterPool = oldFilter.getParentFilterPool();
ISystemFilterPoolManager oldMgr = oldFilterPool.getSystemFilterPoolManager();
ISystemFilterPool newPool = (ISystemFilterPool)targetContainer;
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
ISystemFilter newFilter = oldMgr.moveSystemFilter(newPool, oldFilter, newName);
@ -221,14 +219,14 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTER_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTER_PROGRESS).makeSubstitution(oldName);
}
/**
@ -256,7 +254,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
*/
protected ISystemFilter[] getSelectedFilters()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
ISystemFilter[] filters = new ISystemFilter[selection.size()];
Iterator i = selection.iterator();
int idx=0;

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java
View file

@ -31,7 +31,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -42,7 +41,6 @@ import org.eclipse.swt.widgets.Shell;
* Move a filter pool action.
*/
public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -90,7 +88,7 @@ public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e = selection.iterator();
ISystemFilterPoolManager prevMgr = null;
ISystemFilterPoolManager currMgr = null;
ISystemFilterPool pool;
@ -222,21 +220,21 @@ public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERPOOLS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOLS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERPOOL_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOL_PROGRESS).makeSubstitution(oldName);
}
/**
* Return complete message
*/
public SystemMessage getCompletionMessage(Object targetContainer, String[] oldNames, String[] newNames)
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERPOOL_COMPLETE).makeSubstitution(((ISystemFilterPoolManager)targetContainer).getName());
}
/**
@ -264,7 +262,7 @@ public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
*/
protected ISystemFilterPool[] getSelectedFilterPools()
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
ISystemFilterPool[] filterPools = new ISystemFilterPool[selection.size()];
Iterator i = selection.iterator();
int idx=0;

16
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java
View file

@ -33,7 +33,6 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.actions.SystemBaseAction;
import org.eclipse.rse.ui.actions.SystemBaseCopyAction;
import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
@ -47,7 +46,6 @@ import org.eclipse.swt.widgets.Shell;
* Move a filter string action.
*/
public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
implements ISystemMessages
{
private String promptString = null;
private SystemSimpleContentElement initialSelectionElement = null;
@ -104,7 +102,7 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
{
boolean enable = true;
/* */
Iterator e= ((IStructuredSelection) selection).iterator();
Iterator e= selection.iterator();
while (enable && e.hasNext())
{
Object selectedObject = e.next();
@ -175,7 +173,7 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
ISystemFilterString match = newFilter.getSystemFilterString(oldName);
if (match != null)
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_ALREADYEXISTS);
msg.makeSubstitution(oldName, newFilter.getName());
SystemMessageDialog.displayErrorMessage(shell, msg);
@ -193,8 +191,8 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
ISystemFilter newFilter = (ISystemFilter)targetContainer;
if (supportsDuplicateFilterStrings(newFilter))
return oldName;
ISystemFilterPool newPool = newFilter.getParentFilterPool();
ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
//ISystemFilterPool newPool = newFilter.getParentFilterPool();
//ISystemFilterPoolManager newMgr = newPool.getSystemFilterPoolManager();
String newName = oldName;
ISystemFilterString match = newFilter.getSystemFilterString(oldName);
if (match != null)
@ -270,14 +268,14 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
*/
protected SystemMessage getCopyingMessage()
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERSTRINGS_PROGRESS);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERSTRINGS_PROGRESS);
}
/**
* @see SystemBaseCopyAction#getCopyingMessage( String)
*/
protected SystemMessage getCopyingMessage(String oldName)
{
return RSEUIPlugin.getPluginMessage(MSG_MOVEFILTERSTRING_PROGRESS).makeSubstitution(oldName);
return RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_MOVEFILTERSTRING_PROGRESS).makeSubstitution(oldName);
}
/**
@ -307,7 +305,7 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
{
if (strings == null)
{
IStructuredSelection selection = (IStructuredSelection)getSelection();
IStructuredSelection selection = getSelection();
strings = new ISystemFilterString[selection.size()];
Iterator i = selection.iterator();
int idx=0;

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

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.filters.dialogs;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
@ -51,7 +50,7 @@ import org.eclipse.swt.widgets.Text;
public class SystemFilterNewFilterPoolWizardDefaultMainPage
extends AbstractSystemWizardPage
implements SystemFilterNewFilterPoolWizardMainPageInterface, Listener, ISystemMessages, SelectionListener
implements SystemFilterNewFilterPoolWizardMainPageInterface, Listener, SelectionListener
{
protected Label labelName, labelMgr;
protected Text textName;
@ -329,8 +328,8 @@ public class SystemFilterNewFilterPoolWizardDefaultMainPage
if (iiv != null)
{
int limit = -1;
if (iiv instanceof ISystemValidator)
limit = ((ISystemValidator)iiv).getMaximumNameLength();
if (iiv != null)
limit = iiv.getMaximumNameLength();
if (limit == -1)
limit = ValidatorFilterPoolName.MAX_FILTERPOOLNAME_LENGTH; // default is 50
textName.setTextLimit(limit);

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

@ -73,7 +73,7 @@ import org.eclipse.swt.widgets.Tree;
*/
public class SystemFilterWorkWithFilterPoolsDialog
extends SystemPromptDialog
implements ISystemMessages, ISystemPropertyConstants,
implements ISystemPropertyConstants,
ISelectionChangedListener,
ISystemDeleteTarget, ISystemRenameTarget,
SystemFilterPoolDialogInterface
@ -438,7 +438,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
// ISystemMessages.MSG_EXCEPTION_DELETING,exc,
// pool.getName());
SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(),
RSEUIPlugin.getPluginMessage(MSG_EXCEPTION_DELETING).makeSubstitution(pool.getName(),exc));
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_DELETING).makeSubstitution(pool.getName(),exc));
msgDlg.open();
//RSEUIPlugin.logError("Error deleting filter pool in workwith dialog",exc);
}
@ -512,7 +512,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
// ISystemMessages.MSG_EXCEPTION_RENAMING,exc,
// pool.getName());
SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(),
RSEUIPlugin.getPluginMessage(MSG_EXCEPTION_RENAMING).makeSubstitution(pool.getName(),exc));
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXCEPTION_RENAMING).makeSubstitution(pool.getName(),exc));
msgDlg.open();
//RSEUIPlugin.logError("Error renaming filter pool in workwith dialog",exc);
}
@ -572,7 +572,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
if (inputObj instanceof ISubSystem)
{
ISubSystem ss = (ISubSystem)inputObj;
SystemMessage msg = RSEUIPlugin.getPluginMessage(MSG_FILTERPOOL_CREATED);
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_FILTERPOOL_CREATED);
msg.makeSubstitution("'"+pool.getName()+"'", "'"+ss.getName()+"'");
if (shell.isDisposed() || !shell.isVisible())
shell = getShell();

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

@ -15,7 +15,6 @@
********************************************************************************/
package org.eclipse.rse.ui.filters.dialogs;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
import org.eclipse.swt.widgets.Composite;
@ -28,7 +27,6 @@ import org.eclipse.swt.widgets.Control;
*/
public class SystemNewFilterWizardInfoPage
extends AbstractSystemWizardPage
implements ISystemMessages
{
private ISystemNewFilterWizardConfigurator configurator;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardMainPage.java
View file

@ -20,7 +20,6 @@ import java.util.Vector;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener;
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
@ -43,7 +42,7 @@ import org.eclipse.swt.widgets.Shell;
public class SystemNewFilterWizardMainPage
extends AbstractSystemWizardPage
implements ISystemMessages, ISystemFilterStringEditPaneListener
implements ISystemFilterStringEditPaneListener
//,SystemFilterNewFilterWizardMainPageInterface, ISystemMessageLine
{
protected SystemFilterStringEditPane editPane;

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java
View file

@ -20,7 +20,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolSelectionValidator;
import org.eclipse.rse.filters.ISystemFilterPoolWrapper;
import org.eclipse.rse.filters.ISystemFilterPoolWrapperInformation;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
@ -43,7 +42,7 @@ import org.eclipse.swt.widgets.Text;
*/
public class SystemNewFilterWizardNamePage
extends AbstractSystemWizardPage
implements ISystemMessages, SelectionListener
implements SelectionListener
{
protected Text nameText;
@ -175,7 +174,7 @@ public class SystemNewFilterWizardNamePage
if (poolsToSelectFrom != null)
{
poolVerbage = (Label)SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2PoolVerbage(), nbrColumns, false, 200);
poolVerbage = SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2PoolVerbage(), nbrColumns, false, 200);
poolVerbage.setToolTipText(configurator.getPage2PoolVerbageTip());
poolCombo = SystemWidgetHelpers.createLabeledReadonlyCombo(composite_prompts, null, configurator.getPage2PoolPromptLabel(), configurator.getPage2PoolPromptTooltip());
poolComboLabel = SystemWidgetHelpers.getLastLabel();
@ -202,7 +201,7 @@ public class SystemNewFilterWizardNamePage
}
else if (poolWrapperInformation != null)
{
poolVerbage = (Label)SystemWidgetHelpers.createVerbiage(composite_prompts, poolWrapperInformation.getVerbageLabel(), nbrColumns, false, 200);
poolVerbage = SystemWidgetHelpers.createVerbiage(composite_prompts, poolWrapperInformation.getVerbageLabel(), nbrColumns, false, 200);
//poolWrapperCombo = SystemWidgetHelpers.createLabeledCombo(composite_prompts, null, poolWrapperInformation.getResourceBundle(), poolWrapperInformation.getPromptRBKey()); // d47323
poolWrapperCombo = SystemWidgetHelpers.createLabeledReadonlyCombo(composite_prompts, null, poolWrapperInformation.getPromptLabel(), poolWrapperInformation.getPromptTooltip());
poolComboLabel = SystemWidgetHelpers.getLastLabel();

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemUnNamedFilterDialog.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.filters.dialogs;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener;
@ -36,7 +35,7 @@ import org.eclipse.swt.widgets.Shell;
*/
public class SystemUnNamedFilterDialog extends SystemPromptDialog
implements ISystemMessages,
implements
ISystemFilterStringEditPaneListener
{

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java
View file

@ -20,8 +20,6 @@ import java.net.URL;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/AbstractSystemSubSystemPropertyPageCoreForm.java
View file

@ -21,7 +21,6 @@ import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -37,7 +36,7 @@ import org.eclipse.ui.dialogs.PropertyPage;
* The form for the property page for core subsystem properties.
*/
public abstract class AbstractSystemSubSystemPropertyPageCoreForm
implements ISystemMessages, ISystemSubSystemPropertyPageCoreForm
implements ISystemSubSystemPropertyPageCoreForm
{
protected Label labelTypePrompt, labelVendorPrompt, labelNamePrompt, labelConnectionPrompt, labelProfilePrompt;

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

@ -31,7 +31,6 @@ import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.RSESystemTypeAdapter;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemConnectionForm;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.swt.SWT;

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

@ -20,7 +20,6 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.swt.widgets.Composite;

18
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java
View file

@ -15,10 +15,7 @@
********************************************************************************/
package org.eclipse.rse.ui.propertypages;
import java.util.ResourceBundle;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -33,7 +30,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.PropertyPage;
@ -57,7 +53,7 @@ import org.eclipse.ui.dialogs.PropertyPage;
*
*/
public abstract class SystemBasePropertyPage extends PropertyPage
implements ISystemMessages, ISystemMessageLine, ISystemMessageLineTarget
implements ISystemMessageLine, ISystemMessageLineTarget
{
@ -187,7 +183,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage
{
// see createControl method in org.eclipse.jface.preference.PreferencePage
Composite content = buttonBar.getParent();
Composite pageContainer = content.getParent();
//Composite pageContainer = content.getParent();
//DY The parent PreferencePage class handles this now for us
//DY buttonBar.setVisible(false);
//DY buttonBar.dispose();
@ -202,11 +198,11 @@ public abstract class SystemBasePropertyPage extends PropertyPage
}
if (content != null)
{
if (content.getLayout() instanceof GridLayout)
{
GridLayout layout = (GridLayout)content.getLayout();
//layout.marginHeight= 0; layout.marginWidth= 0;
}
// if (content.getLayout() instanceof GridLayout)
// {
// GridLayout layout = (GridLayout)content.getLayout();
// layout.marginHeight= 0; layout.marginWidth= 0;
// }
content.pack();
}
}

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java
View file

@ -16,7 +16,6 @@
package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter;
@ -24,7 +23,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.ISystemPageCompleteListener;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemPropertyResources;
@ -35,7 +33,6 @@ import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@ -49,7 +46,7 @@ import org.eclipse.swt.widgets.Shell;
* and configuring the pane as described in that method's javadoc.
*/
public class SystemChangeFilterPropertyPage extends SystemBasePropertyPage
implements ISystemMessages, ISystemPageCompleteListener, ISystemChangeFilterPaneEditPaneSupplier
implements ISystemPageCompleteListener, ISystemChangeFilterPaneEditPaneSupplier
{
protected String errorMessage;
@ -208,7 +205,7 @@ public class SystemChangeFilterPropertyPage extends SystemBasePropertyPage
{
int nbrColumns = 1;
Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns);
Label test = SystemWidgetHelpers.createLabel(composite_prompts, SystemPropertyResources.RESID_TERM_NOTAPPLICABLE, nbrColumns, false);
/*Label test =*/ SystemWidgetHelpers.createLabel(composite_prompts, SystemPropertyResources.RESID_TERM_NOTAPPLICABLE, nbrColumns, false);
return composite_prompts;
}

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -31,7 +30,7 @@ import org.eclipse.swt.widgets.Control;
* The plugin.xml file registers this for objects of class org.eclipse.rse.internal.subsystems.SubSystem
*/
public class SystemSubSystemPropertyPageCore extends SystemBasePropertyPage
implements ISystemMessages, ISystemMessageLine//, ISystemMessageLineTarget
implements ISystemMessageLine//, ISystemMessageLineTarget
{
private ISystemSubSystemPropertyPageCoreForm form = null;

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

@ -17,7 +17,6 @@
package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.SystemPropertyResources;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -33,7 +32,6 @@ import org.eclipse.swt.widgets.Label;
* This is an output-only page.
*/
public class SystemTeamViewSubSystemConfigurationPropertyPage extends SystemBasePropertyPage
implements ISystemMessages
{
protected Label labelType, labelName, labelId, labelVendor, labelTypes;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorArchiveName.java
View file

@ -21,6 +21,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -57,7 +58,7 @@ public class ValidatorArchiveName extends ValidatorFileName {
*/
public SystemMessage isSyntaxOk(String newText)
{
msg_NotRegisteredArchive = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ARCHIVE_NAME);
msg_NotRegisteredArchive = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ARCHIVE_NAME);
msg_NotRegisteredArchive.makeSubstitution(newText);
IStatus rc = workspace.validateName(newText, IResource.FILE);
if (rc.getCode() != IStatus.OK)

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.java
View file

@ -28,7 +28,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined compile command's label
*/
public class ValidatorCompileCommandLabel extends ValidatorUniqueString
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_CMDLABEL_LENGTH = 50; // max name for a compile command name
@ -65,10 +65,10 @@ public class ValidatorCompileCommandLabel extends ValidatorUniqueString
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_COMPILELABEL_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_COMPILELABEL_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_COMPILELABEL_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_COMPILELABEL_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_COMPILELABEL_NOTVALID);
}
/**
* Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used.

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorConnectionName.java
View file

@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Shell;
* The IInputValidator interface is used by jface's
* InputDialog class and numerous other platform and system classes.
*/
public class ValidatorConnectionName extends ValidatorFolderName implements ISystemMessages, ISystemValidator
public class ValidatorConnectionName extends ValidatorFolderName implements ISystemValidator
{
public static final int MAX_CONNECTIONNAME_LENGTH = 100; // arbitrary restriction due to defects
@ -43,9 +43,9 @@ public class ValidatorConnectionName extends ValidatorFolderName implements ISys
public ValidatorConnectionName(Vector existingNameList)
{
super(existingNameList);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_CONNECTIONNAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_CONNECTIONNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_CONNECTIONNAME_NOTVALID));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_CONNECTIONNAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_CONNECTIONNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_CONNECTIONNAME_NOTVALID));
}
/**
@ -68,7 +68,7 @@ public class ValidatorConnectionName extends ValidatorFolderName implements ISys
for (int jdx=0; (msg==null) && (jdx<conns.length); jdx++)
{
if (conns[jdx].getAliasName().equalsIgnoreCase(proposedName))
msg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_CONNECTIONNAME_NOTUNIQUE_OTHERPROFILE);
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_CONNECTIONNAME_NOTUNIQUE_OTHERPROFILE);
}
}
if (msg != null)

19
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFileName.java
View file

@ -22,6 +22,7 @@ import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -48,10 +49,10 @@ public class ValidatorFileName
public ValidatorFileName(Vector existingNameList)
{
super(existingNameList, false); // case insensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILENAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILENAME_NOTVALID);
}
/**
* Use this constructor when the name must be unique. Give the
@ -60,10 +61,10 @@ public class ValidatorFileName
public ValidatorFileName(String existingNameList[])
{
super(existingNameList, false); // case insensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILENAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILENAME_NOTVALID);
}
/**
@ -73,10 +74,10 @@ public class ValidatorFileName
public ValidatorFileName()
{
super(new String[0], false);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILENAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILENAME_NOTVALID);
}
/**
* Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used.

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

@ -29,7 +29,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* is used by jface's InputDialog class and property sheet window.
*/
public class ValidatorFilterName
extends ValidatorFileName implements ISystemMessages, ISystemValidator
extends ValidatorFileName implements ISystemValidator
{
public static final int MAX_FILTERNAME_LENGTH = 100;
@ -60,9 +60,9 @@ public class ValidatorFilterName
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERNAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERNAME_NOTVALID));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERNAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERNAME_NOTVALID));
}
public String toString()

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

@ -29,7 +29,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* is used by jface's InputDialog class and property sheet window.
*/
public class ValidatorFilterPoolName
extends ValidatorFolderName implements ISystemMessages, ISystemValidator
extends ValidatorFolderName implements ISystemValidator
{
public static final int MAX_FILTERPOOLNAME_LENGTH = 50;
@ -57,9 +57,9 @@ public class ValidatorFilterPoolName
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERPOOLNAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERPOOLNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERPOOLNAME_NOTVALID));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERPOOLNAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERPOOLNAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERPOOLNAME_NOTVALID));
}

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFilterString.java
View file

@ -30,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* By default, it simply checks for uniqueness.
*/
public class ValidatorFilterString
extends ValidatorUniqueString implements ISystemMessages, ISystemValidator
extends ValidatorUniqueString implements ISystemValidator
{
public static final int MAX_FILTERSTRINGNAME_LENGTH = 1000;
@ -103,9 +103,9 @@ public class ValidatorFilterString
private void init()
{
setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERSTRING_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERSTRING_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FILTERSTRING_NOTVALID));
setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FILTERSTRING_NOTVALID));
}
/**

19
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorFolderName.java
View file

@ -22,6 +22,7 @@ import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -48,10 +49,10 @@ public class ValidatorFolderName
public ValidatorFolderName(Vector existingNameList)
{
super(existingNameList, CASE_INSENSITIVE); // case insensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FOLDERNAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FOLDERNAME_NOTVALID);
}
/**
* Use this constructor when the name must be unique. Give the
@ -60,10 +61,10 @@ public class ValidatorFolderName
public ValidatorFolderName(String existingNameList[])
{
super(existingNameList, CASE_INSENSITIVE); // case sensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FOLDERNAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FOLDERNAME_NOTVALID);
}
/**
@ -73,10 +74,10 @@ public class ValidatorFolderName
public ValidatorFolderName()
{
super(new String[0], CASE_INSENSITIVE);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_FOLDERNAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_FOLDERNAME_NOTVALID);
}
/**
* Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used.

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorPathName.java
View file

@ -18,6 +18,7 @@ package org.eclipse.rse.ui.validators;
import java.util.Vector;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -69,10 +70,10 @@ public class ValidatorPathName
protected void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PATH_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PATH_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PATH_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PATH_NOTVALID);
specialChars = new StringBuffer("*?;'<>|");
nbrSpecialChars = specialChars.length();
}

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorProfileName.java
View file

@ -30,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* InputDialog class and numerous other platform and system classes.
*/
public class ValidatorProfileName
extends ValidatorFolderName implements ISystemMessages, ISystemValidator
extends ValidatorFolderName implements ISystemValidator
{
public static final int MAX_PROFILENAME_LENGTH = 100; // arbitrary restriction! Defect 41816
private SystemMessage reservedNameMsg;
@ -41,9 +41,9 @@ public class ValidatorProfileName
public ValidatorProfileName(Vector existingNameList)
{
super(existingNameList);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_NOTVALID));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_NOTUNIQUE),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_NOTVALID));
}
/**
@ -60,7 +60,7 @@ public class ValidatorProfileName
private SystemMessage getReservedNameMessage()
{
if (reservedNameMsg == null)
reservedNameMsg = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_PROFILENAME_RESERVED);
reservedNameMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PROFILENAME_RESERVED);
return reservedNameMsg;
}

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSourceType.java
View file

@ -26,7 +26,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* However, this class is defined to be easily subclassed.
*/
public class ValidatorSourceType extends ValidatorUniqueString
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_SRCTYPE_LENGTH = 50; // max name for a src type
@ -45,9 +45,9 @@ public class ValidatorSourceType extends ValidatorUniqueString
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_NOTUNIQUE));
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_SRCTYPE_NOTVALID);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_NOTUNIQUE));
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_SRCTYPE_NOTVALID);
}
/**

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

@ -28,7 +28,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* InputDialog class and numerous other platform and system classes.
*/
public class ValidatorSpecialChar
implements ISystemMessages, ISystemValidator // IInputValidator, ICellEditorValidator
implements ISystemValidator // IInputValidator, ICellEditorValidator
{
public static final boolean EMPTY_ALLOWED_NO = false;
@ -47,7 +47,7 @@ public class ValidatorSpecialChar
*/
public ValidatorSpecialChar(String specialChars, boolean isEmptyAllowed)
{
this(specialChars, isEmptyAllowed, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTVALID), RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY));
this(specialChars, isEmptyAllowed, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTVALID), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY));
}
/**
* Constructor
@ -57,7 +57,7 @@ public class ValidatorSpecialChar
*/
public ValidatorSpecialChar(String specialChars, boolean isEmptyAllowed, SystemMessage msg_Invalid)
{
this(specialChars, isEmptyAllowed, msg_Invalid, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY));
this(specialChars, isEmptyAllowed, msg_Invalid, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY));
}
/**
* Constructor

19
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorSystemName.java
View file

@ -18,6 +18,7 @@ package org.eclipse.rse.ui.validators;
import java.util.Vector;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
@ -46,10 +47,10 @@ public class ValidatorSystemName
public ValidatorSystemName(Vector existingNameList)
{
super(existingNameList, true); // case sensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID);
}
/**
* Use this constructor when the name must be unique. Give the
@ -58,10 +59,10 @@ public class ValidatorSystemName
public ValidatorSystemName(String existingNameList[])
{
super(existingNameList, true); // case sensitive uniqueness
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID);
}
/**
@ -71,10 +72,10 @@ public class ValidatorSystemName
public ValidatorSystemName()
{
super(new String[0], true);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTUNIQUE));
fUnique = false;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_NAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_NOTVALID);
}
/**
* Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used.

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java
View file

@ -33,7 +33,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* is used by jface's InputDialog class and property sheet window.
*/
public class ValidatorUniqueString
implements ISystemMessages, ISystemValidator, ISystemValidatorUniqueString
implements ISystemValidator, ISystemValidatorUniqueString
//,IInputValidator, ICellEditorValidator ... ISystemValidator extends these
{
@ -59,8 +59,8 @@ public class ValidatorUniqueString
this.caseSensitive = caseSensitive;
setExistingNamesList(existingList);
// initialize error messages
setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTUNIQUE));
setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTUNIQUE));
}
/**
* Constructor accepting an Array.
@ -72,8 +72,8 @@ public class ValidatorUniqueString
this.caseSensitive = caseSensitive;
init(existingList, caseSensitive);
// initialize error messages
setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_ENTRY_NOTUNIQUE));
setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_ENTRY_NOTUNIQUE));
}
/**
* Constructor accepting a Vector and another validator to use for the syntax checking.

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.java
View file

@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined action's command
*/
public class ValidatorUserActionCommand
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_UDACMD_LENGTH = 512; // max command for an action

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionComment.java
View file

@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined action's comment
*/
public class ValidatorUserActionComment
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_UDACMT_LENGTH = 256; // max comment for an action

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserActionName.java
View file

@ -28,7 +28,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined action's name.
*/
public class ValidatorUserActionName extends ValidatorUniqueString
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_UDANAME_LENGTH = 256; // max name for an action
@ -67,10 +67,10 @@ public class ValidatorUserActionName extends ValidatorUniqueString
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_NOTUNIQUE));
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_NOTUNIQUE));
fUnique = true;
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDANAME_NOTVALID);
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDANAME_NOTVALID);
}
/**
* Supply your own error message text. By default, messages from RSEUIPlugin resource bundle are used.

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

@ -30,14 +30,14 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* InputDialog class and numerous other platform and system classes.
*/
public class ValidatorUserId
extends ValidatorSpecialChar implements ISystemMessages
extends ValidatorSpecialChar
{
/**
* Constructor
*/
public ValidatorUserId(boolean isEmptyAllowed)
{
super("=;", isEmptyAllowed, RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_NOTVALID), RSEUIPlugin.getPluginMessage(MSG_VALIDATE_USERID_EMPTY));
super("=;", isEmptyAllowed, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_NOTVALID), RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY));
}
/**

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeName.java
View file

@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined type's name.
*/
public class ValidatorUserTypeName extends ValidatorUniqueString
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_UDTNAME_LENGTH = 50; // max name for a file type
@ -41,9 +41,9 @@ public class ValidatorUserTypeName extends ValidatorUniqueString
private void init()
{
super.setErrorMessages(RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_EMPTY),
RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_NOTUNIQUE));
msg_Invalid = RSEUIPlugin.getPluginMessage(MSG_VALIDATE_UDTNAME_NOTVALID);
super.setErrorMessages(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_EMPTY),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_NOTUNIQUE));
msg_Invalid = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_UDTNAME_NOTVALID);
}
/**

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.java
View file

@ -24,7 +24,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* This class is used to verify a user defined action's comment
*/
public class ValidatorUserTypeTypes
implements ISystemMessages, ISystemValidator
implements ISystemValidator
{
public static final int MAX_UDTTYPES_LENGTH = 512;

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

@ -18,14 +18,12 @@ package org.eclipse.rse.ui.view;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Vector;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
@ -43,7 +41,6 @@ import org.eclipse.rse.model.ISystemResourceSet;
import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;

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

@ -24,7 +24,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.swt.widgets.Shell;

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

@ -43,9 +43,7 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.filters.SystemFilterPoolWrapperInformation;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;
@ -55,7 +53,6 @@ import org.eclipse.rse.ui.actions.SystemClearPasswordAction;
import org.eclipse.rse.ui.actions.SystemConnectAction;
import org.eclipse.rse.ui.actions.SystemDisconnectAction;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
import org.eclipse.rse.ui.filters.actions.ISystemNewFilterActionConfigurator;
import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction;
import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
@ -79,9 +76,8 @@ import org.eclipse.rse.ui.propertypages.ISystemSubSystemPropertyPageCoreForm;
import org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage;
import org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage;
import org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCoreForm;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm;
import org.eclipse.rse.ui.widgets.IServerLauncherForm;
import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage;
import org.eclipse.rse.ui.wizards.SystemSubSystemsPropertiesWizardPage;
@ -629,7 +625,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
ISystemProfile activeProfile = selectedSubSystem.getHost().getSystemProfile();
for (int idx = 0; idx < activeProfiles.length; idx++)
{
ISystemFilterPool defaultPool = getDefaultSystemFilterPool(factory, (ISystemProfile)activeProfiles[idx]);
ISystemFilterPool defaultPool = getDefaultSystemFilterPool(factory, activeProfiles[idx]);
if (defaultPool != null)
{

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

@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Shell;
* use as a parent class.
*/
public abstract class SystemAbstractAPIProvider
implements ISystemViewInputProvider, ISystemMessages
implements ISystemViewInputProvider
{
@ -132,9 +132,9 @@ public abstract class SystemAbstractAPIProvider
private void initMsgObjects()
{
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null);
errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null);
errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
}
/**

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

@ -25,7 +25,6 @@ import org.eclipse.rse.filters.ISystemFilterStringReference;
import org.eclipse.rse.filters.SystemFilterSimple;
import org.eclipse.rse.internal.model.SystemNewConnectionPromptObject;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.swt.widgets.Shell;
@ -41,7 +40,7 @@ import org.eclipse.swt.widgets.Shell;
*/
public class SystemSelectRemoteObjectAPIProviderImpl
extends SystemAbstractAPIProvider
implements ISystemViewInputProvider, ISystemMessages
implements ISystemViewInputProvider
{

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

@ -30,7 +30,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
*/
public class SystemTestFilterStringAPIProviderImpl
extends SystemAbstractAPIProvider
implements ISystemViewInputProvider, ISystemMessages
implements ISystemViewInputProvider
{
@ -55,9 +55,9 @@ public class SystemTestFilterStringAPIProviderImpl
private void initMsgObjects()
{
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null);
errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null);
canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null);
errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
}
/**

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

@ -35,7 +35,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* Used when user right clicks on a filter string and selects Open In New Perspective.
*/
public class SystemViewAPIProviderForFilterStrings
extends SystemAbstractAPIProvider implements ISystemMessages
extends SystemAbstractAPIProvider
{
@ -140,21 +140,21 @@ public class SystemViewAPIProviderForFilterStrings
if ((children == null) || (children.length==0))
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),
ISystemMessageObject.MSGTYPE_EMPTY, element);
}
}
catch (InterruptedException exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED),
ISystemMessageObject.MSGTYPE_CANCEL, element);
System.out.println("Canceled.");
}
catch (Exception exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),
ISystemMessageObject.MSGTYPE_ERROR, element);
System.out.println("Exception resolving filter strings: " + exc.getClass().getName() + ", " + exc.getMessage());
exc.printStackTrace();

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

@ -43,7 +43,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
* Used when user right clicks on a filter and selects Open In New Perspective.
*/
public class SystemViewAPIProviderForFilters
extends SystemAbstractAPIProvider implements ISystemMessages
extends SystemAbstractAPIProvider
{
@ -138,13 +138,13 @@ public class SystemViewAPIProviderForFilters
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell());
if (newFilter == null)
{
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED),
ISystemMessageObject.MSGTYPE_CANCEL,element);
}
else // filter successfully created!
{
// return "filter created successfully" message object for this node
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED),
ISystemMessageObject.MSGTYPE_OBJECTCREATED,element);
// select the new filter reference...
ISubSystem ss = fRef.getSubSystem();
@ -163,7 +163,7 @@ public class SystemViewAPIProviderForFilters
}
}
} catch (Exception exc) {
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),
ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception prompting for filter ",exc);
}
@ -194,14 +194,14 @@ public class SystemViewAPIProviderForFilters
catch (InterruptedException exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED),
ISystemMessageObject.MSGTYPE_CANCEL,element);
SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving canceled by user.");
}
catch (Exception exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),
ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception resolving filters' strings ",exc);
} // message already issued
@ -209,7 +209,7 @@ public class SystemViewAPIProviderForFilters
if ((children == null) || (children.length==0))
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),
ISystemMessageObject.MSGTYPE_EMPTY, element);
}
return children;

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

@ -47,10 +47,8 @@ import org.eclipse.ui.part.PluginTransferData;
* Drop adapter for dropping objects in the Systems views.
*
*/
public class SystemViewDataDropAdapter extends ViewerDropAdapter implements ISystemMessages
public class SystemViewDataDropAdapter extends ViewerDropAdapter
{
protected Shell shell;
protected long hoverStart = 0;
@ -141,7 +139,7 @@ public class SystemViewDataDropAdapter extends ViewerDropAdapter implements ISy
String[] resources = (String[]) data;
for (int i = 0; i < resources.length; i++)
{
String resource = (String)resources[i];
String resource = resources[i];
srcObjects.add(resource);
}
_sourceType = SystemDNDTransferRunnable.SRC_TYPE_OS_RESOURCE;

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

@ -58,7 +58,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
* behaviour. If this is done, you must register your subclass with the
* platform's adapter manager in your plugin class's startup method.
*/
public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter, ISystemMessages
public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter
{
//private static String translatedFilterString = null;
// -------------------
@ -299,7 +299,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement
//SubSystem ss = (SubSystem)simpleFilter.getParent();
// return "filter created successfully" message object for this node
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED),
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED),
ISystemMessageObject.MSGTYPE_OBJECTCREATED,filter);
// select the new filter and expand it

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

@ -64,7 +64,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
*/
public class SystemViewFilterReferenceAdapter
extends AbstractSystemViewAdapter
implements ISystemViewElementAdapter, ISystemMessages
implements ISystemViewElementAdapter
{
//private static String translatedFilterString = null;
// -------------------
@ -87,7 +87,7 @@ public class SystemViewFilterReferenceAdapter
// return; // does not make sense adding unique actions per multi-selection
ISystemFilter filter = getFilter(selection.getFirstElement());
ISubSystemConfiguration ssFactory = getSubSystemConfiguration(filter);
ISubSystem currentSubSystem = (ISubSystem) getFilterReference(selection.getFirstElement()).getSubSystem();
ISubSystem currentSubSystem = getFilterReference(selection.getFirstElement()).getSubSystem();
IHost currentConnection = currentSubSystem.getHost();
ssFactory.setConnection(currentConnection);
ssFactory.setCurrentSelection(selection.toArray());
@ -208,7 +208,7 @@ public class SystemViewFilterReferenceAdapter
if (showFPs)
return parentContainer;
else
return (ISubSystem) fr.getProvider();
return fr.getProvider();
//return fr.getParent();
}
@ -266,12 +266,12 @@ public class SystemViewFilterReferenceAdapter
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell());
if (newFilter == null)
{
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
}
else // filter successfully created!
{
// return "filter created successfully" message object for this node
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FILTERCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, element);
// select the new filter reference...
ISystemFilterReference sfr = fRef.getParentSystemFilterReferencePool().getExistingSystemFilterReference(ss, newFilter);
ISystemViewInputProvider inputProvider = getInput();
@ -290,7 +290,7 @@ public class SystemViewFilterReferenceAdapter
}
catch (Exception exc)
{
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception prompting for filter ", exc);
}
//RSEUIPlugin.logDebugMessage(this.getClass().getName(),"returning children");
@ -393,20 +393,20 @@ public class SystemViewFilterReferenceAdapter
catch (InterruptedException exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element);
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Filter resolving canceled by user.");
}
catch (Exception exc)
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception resolving filters' strings ", exc);
} // message already issued
if ((children == null) || (children.length == 0))
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element);
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY), ISystemMessageObject.MSGTYPE_EMPTY, element);
}
return children;
}

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

@ -26,7 +26,6 @@ import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.SystemResources;
@ -38,7 +37,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
/**
* Default Adapter for displaying filter string objects in tree views.
*/
public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter, ISystemMessages
public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter
{
//private static String translatedFilterString = null;
// -------------------

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

@ -20,7 +20,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemResourceManager;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java
View file

@ -17,8 +17,6 @@
package org.eclipse.rse.ui.widgets.services;
import java.util.ArrayList;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java
View file

@ -15,7 +15,6 @@
********************************************************************************/
package org.eclipse.rse.ui.wizards;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
View file

@ -24,7 +24,6 @@ import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java
View file

@ -20,7 +20,6 @@ import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.ISystemConnectionFormCaller;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemConnectionForm;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -44,7 +43,7 @@ import org.eclipse.swt.widgets.Control;
public class RSENewConnectionWizardDefaultDelegateMainPage
//extends WizardPage
extends AbstractSystemWizardPage
implements ISystemMessages, ISystemNewConnectionWizardMainPage,
implements ISystemNewConnectionWizardMainPage,
ISystemMessageLine, ISystemConnectionFormCaller
{
protected String[] restrictSystemTypesTo;

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

@ -20,22 +20,17 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IPropertySet;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.model.DummyHost;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.widgets.services.ConnectorServiceElement;
import org.eclipse.rse.ui.widgets.services.FactoryServiceElement;
import org.eclipse.rse.ui.widgets.services.PropertyElement;
import org.eclipse.rse.ui.widgets.services.RootServiceElement;
import org.eclipse.rse.ui.widgets.services.ServerLauncherPropertiesServiceElement;
import org.eclipse.rse.ui.widgets.services.ServiceElement;
@ -87,7 +82,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
IServiceSubSystemConfiguration currentFactory = (IServiceSubSystemConfiguration)getSubSystemConfiguration();
String systemTypeStr = getMainPage().getSystemType();
IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeStr);
//IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeStr);
IServiceSubSystemConfiguration[] factories = getServiceSubSystemFactories(systemTypeStr, currentFactory.getServiceType());
@ -193,7 +188,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
{
((IServiceSubSystem)ss).switchServiceFactory(_selectedFactory);
}
IHost realHost = ss.getHost();
//IHost realHost = ss.getHost();
if (_root != null)
{
{
@ -229,7 +224,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar
ServiceElement[] children = _root.getChildren();
for (int i = 0; i < children.length; i++)
{
ServiceElement child = (ServiceElement)children[i];
ServiceElement child = children[i];
if (child instanceof FactoryServiceElement)
{
FactoryServiceElement fchild = (FactoryServiceElement)child;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java
View file

@ -20,7 +20,6 @@ import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.ui.ISystemConnectionFormCaller;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemConnectionForm;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
@ -44,7 +43,7 @@ import org.eclipse.swt.widgets.Control;
public class SystemNewConnectionWizardDefaultMainPage
//extends WizardPage
extends AbstractSystemWizardPage
implements ISystemMessages, ISystemNewConnectionWizardMainPage,
implements ISystemNewConnectionWizardMainPage,
ISystemMessageLine, ISystemConnectionFormCaller
{
protected String[] restrictSystemTypesTo;

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardRenameProfilePage.java
View file

@ -17,7 +17,6 @@
package org.eclipse.rse.ui.wizards;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.internal.model.SystemProfileManager;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemProfileForm;
import org.eclipse.rse.ui.SystemResources;
@ -35,7 +34,7 @@ import org.eclipse.swt.widgets.Control;
public class SystemNewConnectionWizardRenameProfilePage
extends AbstractSystemWizardPage
implements ISystemMessages,
implements
ISystemMessageLine
{

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java
View file

@ -17,7 +17,6 @@
package org.eclipse.rse.ui.wizards;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -42,7 +41,7 @@ import org.eclipse.swt.widgets.Text;
public class SystemNewProfileWizardMainPage
extends AbstractSystemWizardPage
implements ISystemMessages,
implements
ISystemMessageLine
{

7
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
View file

@ -16,11 +16,8 @@
package org.eclipse.rse.core.subsystems;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.rse.core.persistance.IRSEPersistableContainer;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool;
@ -28,16 +25,12 @@ import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell;
public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvider, IRSEPersistableContainer
{
// ---------------------------------