mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 07:05:24 +02:00
getting rid of ibm strings
This commit is contained in:
David McKnight
parent
94260734eb
commit
7128ff317a
61 changed files with 297 additions and 160 deletions
|
|
@ -23,7 +23,6 @@ package org.eclipse.rse.files.ui;
|
|||
*/
|
||||
public interface ISystemFileConstants
|
||||
{
|
||||
// public static final String PLUGIN_ID ="com.ibm.etools.systems";
|
||||
public static final String PLUGIN_ID ="org.eclipse.rse.files.ui";
|
||||
public static final String PREFIX = PLUGIN_ID+".files.";
|
||||
// Icons
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import org.eclipse.ui.IObjectActionDelegate;
|
|||
|
||||
/**
|
||||
* This is a base class to simplify the creation of actions supplied via the
|
||||
* com.ibm.etools.systems.core.popupMenus extension point, targeting remote files
|
||||
* org.eclipse.rse.ui.popupMenus extension point, targeting remote files
|
||||
* and/or remote folders.
|
||||
* <p>
|
||||
* The only method you must implement is {@link #run()}.
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
|
|||
{
|
||||
//System.out.println("Firing REFRESH_REMOTE");
|
||||
sr.fireEvent(
|
||||
new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
|
||||
new org.eclipse.rse.model.impl.SystemResourceChangeEvent(
|
||||
parent,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, null) );
|
||||
}
|
||||
else
|
||||
|
|
@ -176,11 +176,11 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
|
|||
//System.out.println("MOVE OPERATION: Firing REFRESH");
|
||||
// FIRST REFRESH EXPANDED FILTER
|
||||
sr.fireEvent(
|
||||
new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
|
||||
new org.eclipse.rse.model.impl.SystemResourceChangeEvent(
|
||||
parent,ISystemResourceChangeEvent.EVENT_REFRESH, null) );
|
||||
// NEXT REFRESH ALL OTHER PLACES THAT MIGHT BE SHOWING THE SOURCE FOLDER
|
||||
sr.fireEvent(
|
||||
new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
|
||||
new org.eclipse.rse.model.impl.SystemResourceChangeEvent(
|
||||
firstSelectionParent,ISystemResourceChangeEvent.EVENT_REFRESH_REMOTE, null) );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import org.eclipse.ui.IWorkbenchPropertyPage;
|
|||
|
||||
/**
|
||||
* This is a base class to simplify the creation of property pages supplied via the
|
||||
* com.ibm.etools.systems.core.propertyPages extension point, targeting remote files
|
||||
* org.eclipse.rse.ui.propertyPages extension point, targeting remote files
|
||||
* and/or remote folders.
|
||||
* <p>
|
||||
* The only method you must implement is {@link #createContentArea(Composite)}.
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ import org.eclipse.swt.widgets.Shell;
|
|||
*/
|
||||
public class SystemSearchPage extends DialogPage implements ISearchPage {
|
||||
|
||||
public static final String SYSTEM_SEARCH_PAGE_ID = "com.ibm.etools.systems.core.search.searchPage";
|
||||
public static final String SYSTEM_SEARCH_PAGE_ID = "org.eclipse.rse.files.ui.search.searchPage";
|
||||
|
||||
// search utility
|
||||
private SystemSearchUtil util;
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ public class Logger implements IPropertyChangeListener {
|
|||
* and the output will be:<br>
|
||||
* <br>
|
||||
* ---------------------------------------------------------------<br>
|
||||
* DEBUG com.ibm.etools.systems.logging someClassName<br>
|
||||
* DEBUG org.eclipse.rse.logging someClassName<br>
|
||||
* someMessage<br>
|
||||
* ---------------------------------------------------------------<br>
|
||||
* <br>
|
||||
|
|
|
|||
|
|
@ -289,11 +289,6 @@ public class PerformanceLogger {
|
|||
register(DEFAULT_COMPONENT, "", "");
|
||||
}
|
||||
/*Use the class method name for CallerID*/
|
||||
/*
|
||||
* Sample method name retruned by getMethodName():
|
||||
* " com.ibm.etools.iseries.core.resources.ISeriesEditableSrcPhysicalFileMember.doDownload(ISeriesEditableSrcPhysicalFileMember.java:558)"
|
||||
*
|
||||
*/
|
||||
String methodPath = getMethodName(true);
|
||||
|
||||
return start(DEFAULT_COMPONENT, methodPath);
|
||||
|
|
@ -597,8 +592,8 @@ public class PerformanceLogger {
|
|||
* Here to parse the exception string to get the caller which is the current method location
|
||||
* to be obtained. The Exception stack should show the PerformanceLogger start() in the satck first:
|
||||
* -java.lang.Exception
|
||||
* -at com.ibm.etools.systems.logging.performance.PerformanceLogger.start(PerformanceLogger.java:151)
|
||||
* -at com.ibm.etools.systems.logging.performance.PerformanceLogger.start(PerformanceLogger.java:135)
|
||||
* -at org.eclipse.rse.logging.performance.PerformanceLogger.start(PerformanceLogger.java:151)
|
||||
* -at org.eclipse.rse.logging.performance.PerformanceLogger.start(PerformanceLogger.java:135)
|
||||
* Depending if the caller is using default task ID or not, so the caller is the 3rd or the 4th in the stack.
|
||||
*/
|
||||
|
||||
|
|
@ -609,16 +604,14 @@ public class PerformanceLogger {
|
|||
methodPath = methodPath.substring(4);
|
||||
if (parsed) {
|
||||
try {
|
||||
/* The method name obtained looks like this:
|
||||
* " com.ibm.etools.iseries.core.resources.ISeriesEditableSrcPhysicalFileMember.doDownload(ISeriesEditableSrcPhysicalFileMember.java:558)"
|
||||
*/
|
||||
|
||||
int i = methodPath.indexOf('(');
|
||||
if (i != -1) methodPath = methodPath.substring(0, i); //strip of the substring enclosed in ()
|
||||
//Now we have "com.ibm.etools.systems.logging.performance.PerformanceLogger.start"
|
||||
//Now we have "org.eclipse.rse.logging.performance.PerformanceLogger.start"
|
||||
i = methodPath.lastIndexOf('.'); //Get the method name after the last period (.)
|
||||
String methodName = methodPath.substring(i + 1); //Now we have the method name "start"
|
||||
String className = methodPath.substring(0, i); //remove method name from the string
|
||||
//We are left with "com.ibm.etools.systems.logging.performance.PerformanceLogger"
|
||||
//We are left with "org.eclipse.rse.logging.performance.PerformanceLogger"
|
||||
i = className.lastIndexOf('.');
|
||||
if (i != -1) className = className.substring(i + 1); //Now we have the class name "PerformanceLogger"
|
||||
methodPath = className + "." + methodName;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ public abstract class LoggingPreferencePage extends PreferencePage implements IW
|
|||
text = LoggingPreferenceLabels.LOGGING_PREFERENCE_PAGE_FULL_DEBUG;
|
||||
radioButton3 = createRadioButton(composite1_radioButton, LabelUtil.assignMnemonic(text, used));
|
||||
initializeValues();
|
||||
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "com.ibm.etools.systems.logging.rsel0000");
|
||||
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.eclipse.rse.logging.rsel0000");
|
||||
return new Composite(parent, SWT.NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rmtjardesc>
|
||||
<jar path="mjberger.dmcknigh3:/opt/rseserver800/dstore_miners.jar"/>
|
||||
<options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.rse.services.dstore/dstore_miners.rmtjardesc" exportErrors="true" exportWarnings="true" overwrite="false" saveDescription="true" useSourceFolders="false"/>
|
||||
<manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
|
||||
<sealing sealJar="false">
|
||||
<packagesToSeal/>
|
||||
<packagesToUnSeal/>
|
||||
</sealing>
|
||||
</manifest>
|
||||
<selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
|
||||
<javaElement handleIdentifier="=org.eclipse.rse.services.dstore/miners"/>
|
||||
</selectedElements>
|
||||
</rmtjardesc>
|
||||
|
|
@ -193,10 +193,6 @@ public class DStoreShellThread
|
|||
if (_cmdMinerElement == null || _cmdMinerElement.getDataStore() != _dataStore)
|
||||
{
|
||||
_cmdMinerElement = _dataStore.findMinerInformation(getCmdSystemMinerId());
|
||||
if (_cmdMinerElement == null)
|
||||
{
|
||||
_cmdMinerElement = _dataStore.findMinerInformation(getOldCmdSystemMinerId());
|
||||
}
|
||||
}
|
||||
return _cmdMinerElement;
|
||||
}
|
||||
|
|
@ -208,10 +204,6 @@ public class DStoreShellThread
|
|||
{
|
||||
_envMinerElement = _dataStore.findMinerInformation(getEnvSystemMinerId());
|
||||
|
||||
if (_envMinerElement == null)
|
||||
{
|
||||
_envMinerElement = _dataStore.findMinerInformation(getOldEnvSystemMinerId());
|
||||
}
|
||||
}
|
||||
return _envMinerElement;
|
||||
}
|
||||
|
|
@ -222,10 +214,6 @@ public class DStoreShellThread
|
|||
return CommandMiner.MINER_ID;
|
||||
}
|
||||
|
||||
protected String getOldCmdSystemMinerId()
|
||||
{
|
||||
return "com.ibm.etools.systems.dstore.miners.command.CommandMiner";
|
||||
}
|
||||
|
||||
protected String getEnvSystemMinerId()
|
||||
{
|
||||
|
|
@ -246,11 +234,7 @@ public class DStoreShellThread
|
|||
{
|
||||
return "C_SET_ENVIRONMENT_VARIABLES";
|
||||
}
|
||||
|
||||
protected String getOldEnvSystemMinerId()
|
||||
{
|
||||
return "com.ibm.etools.systems.dstore.miners.environment.EnvironmentMiner";
|
||||
}
|
||||
|
||||
|
||||
public void writeToShell(String command)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -129,10 +129,6 @@ public class DStoreShellService extends AbstractDStoreService implements IShellS
|
|||
return EnvironmentMiner.MINER_ID;
|
||||
}
|
||||
|
||||
protected String getOldEnvSystemMinerId()
|
||||
{
|
||||
return "com.ibm.etools.systems.dstore.miners.environment.EnvironmentMiner";
|
||||
}
|
||||
|
||||
public boolean isInitialized()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ public class LocalShellThread extends Thread
|
|||
// by the contributor of the pty exectuable
|
||||
// on linux client this is a likely scenario
|
||||
PSEUDO_TERMINAL = System.getProperty("rse.pty");
|
||||
//PSEUDO_TERMINAL ="platform:/base/plugins/com.ibm.etools.power.universal.server/server.components/intellinux/pty/pty";
|
||||
try
|
||||
{
|
||||
PSEUDO_TERMINAL = Platform.resolve(new URL(PSEUDO_TERMINAL)).getPath();
|
||||
|
|
|
|||
|
|
@ -1947,7 +1947,7 @@ public class SystemZipHandler implements ISystemArchiveHandler
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.core.archiveutils.ISystemArchiveHandler#getCompressedSizeFor(java.lang.String)
|
||||
* @see org.eclipse.rse.core.archiveutils.ISystemArchiveHandler#getCompressedSizeFor(java.lang.String)
|
||||
*/
|
||||
public long getCompressedSizeFor(String fullVirtualName)
|
||||
{
|
||||
|
|
@ -1982,7 +1982,7 @@ public class SystemZipHandler implements ISystemArchiveHandler
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.core.archiveutils.ISystemArchiveHandler#getCompressionMethodFor(java.lang.String)
|
||||
* @see org.eclipse.rse.core.archiveutils.ISystemArchiveHandler#getCompressionMethodFor(java.lang.String)
|
||||
*/
|
||||
public String getCompressionMethodFor(String fullVirtualName)
|
||||
{
|
||||
|
|
@ -2016,7 +2016,7 @@ public class SystemZipHandler implements ISystemArchiveHandler
|
|||
else return "";
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.core.archiveutils.ISystemArchiveHandler#getArchiveComment()
|
||||
* @see org.eclipse.rse.core.archiveutils.ISystemArchiveHandler#getArchiveComment()
|
||||
*/
|
||||
public String getArchiveComment()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class UniversalAIXProcessHandler implements ProcessHandler, ISystemProces
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.handlers.ProcessHandler#lookupProcesses(com.ibm.etools.systems.processes.clientserver.RemoteProcessFilterString)
|
||||
* @see org.eclipse.rse.services.clientserver.processes.handlers.ProcessHandler#lookupProcesses
|
||||
*/
|
||||
public SortedSet lookupProcesses(IHostProcessFilter rpfs)
|
||||
throws Exception
|
||||
|
|
@ -167,7 +167,7 @@ public class UniversalAIXProcessHandler implements ProcessHandler, ISystemProces
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.handlers.ProcessHandler#kill(com.ibm.etools.systems.processes.clientserver.handlers.IRemoteServerProcess, java.lang.String)
|
||||
* @see org.eclipse.rse.services.clientserver.processes.ProcessHandler#kill
|
||||
*/
|
||||
public IHostProcess kill(IHostProcess process, String type)
|
||||
throws Exception
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ public class UniversalLinuxProcessHandler implements ProcessHandler, IServiceCon
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.universal.processes.ProcessHandler#kill(com.ibm.etools.systems.universal.processes.IRemoteServerProcess, java.lang.String)
|
||||
* @see org.eclipse.rse.services.clientserver.processes.ProcessHandler#kill
|
||||
*/
|
||||
public IHostProcess kill(IHostProcess process, String type) throws Exception
|
||||
{
|
||||
|
|
@ -72,7 +72,7 @@ public class UniversalLinuxProcessHandler implements ProcessHandler, IServiceCon
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.universal.processes.ProcessHandler#lookupProcesses(com.ibm.etools.systems.processes.clientserver.RemoteProcessFilterString, java.lang.String)
|
||||
* @see org.eclipse.rse.services.clientserver.processes.ProcessHandler#lookupProcesses
|
||||
*/
|
||||
public SortedSet lookupProcesses(IHostProcessFilter rpfs) throws Exception
|
||||
{
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ public class UniversalServerProcessImpl implements IRemoteServerProcess, IServic
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getLabel()
|
||||
* @see org.eclipse.rse.services.clientserver.processes.IRemoteProcess#getLabel()
|
||||
*/
|
||||
public String getLabel()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class UniversalZOSProcessHandler extends UniversalAIXProcessHandler
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.handlers.ProcessHandler#lookupProcesses(com.ibm.etools.systems.processes.clientserver.RemoteProcessFilterString)
|
||||
* @see org.eclipse.rse.services.clientserver.processes.handlers.ProcessHandler#lookupProcesses
|
||||
*/
|
||||
public SortedSet lookupProcesses(HostProcessFilterImpl rpfs)
|
||||
throws Exception
|
||||
|
|
|
|||
|
|
@ -59,8 +59,7 @@ public class SystemExportShellHistoryAction extends SystemBaseShellAction
|
|||
|
||||
FileDialog fdlg = new FileDialog(getShell(), SWT.SAVE);
|
||||
fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE);
|
||||
//fdlg.setText(RSEUIPlugin.getString("com.ibm.etools.systems.ui.RmtJarExport.selectOrEnterJarDialog.title"));
|
||||
fdlg.setFileName(cmdShell.getId() + "-history.txt");
|
||||
fdlg.setFileName(cmdShell.getId() + "-history.txt");
|
||||
fdlg.setFilterExtensions(new String[] {"*.txt"});
|
||||
String fileName = fdlg.open();
|
||||
try
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ public class SystemExportShellOutputAction extends SystemBaseShellAction
|
|||
|
||||
FileDialog fdlg = new FileDialog(getShell(),SWT.SAVE);
|
||||
fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE);
|
||||
//fdlg.setText(RSEUIPlugin.getString("com.ibm.etools.systems.ui.RmtJarExport.selectOrEnterJarDialog.title"));
|
||||
fdlg.setFileName(cmdShell.getId() + "-output.txt");
|
||||
fdlg.setFilterExtensions(new String[] {"*.txt"});
|
||||
String fileName = fdlg.open();
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class SystemShellPropertyPage extends SystemBasePropertyPage
|
|||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.core.ui.propertypages.SystemBasePropertyPage#createContentArea(org.eclipse.swt.widgets.Composite)
|
||||
* @see org.eclipse.rse.ui.propertypages.SystemBasePropertyPage#createContentArea(org.eclipse.swt.widgets.Composite)
|
||||
*/
|
||||
protected Control createContentArea(Composite parent)
|
||||
{
|
||||
|
|
@ -115,7 +115,7 @@ public class SystemShellPropertyPage extends SystemBasePropertyPage
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.core.ui.propertypages.SystemBasePropertyPage#verifyPageContents()
|
||||
* @see org.eclipse.rse.ui.propertypages.SystemBasePropertyPage#verifyPageContents()
|
||||
*/
|
||||
protected boolean verifyPageContents()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ import org.eclipse.swt.widgets.Composite;
|
|||
|
||||
/**
|
||||
* This is the desktop view wrapper of the System View viewer.
|
||||
* ViewPart is from com.ibm.itp.ui.support.parts
|
||||
*/
|
||||
public class CommandsViewWorkbook extends Composite
|
||||
{
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList
|
|||
|
||||
|
||||
// constants
|
||||
public static final String ID = "com.ibm.etools.systems.core.ui.view.buildErrorView";
|
||||
public static final String ID = "org.eclipse.rse.shells.ui.view.buildErrorView";
|
||||
// matches id in plugin.xml, view tag
|
||||
|
||||
private SystemBuildErrorView _viewer;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ import org.eclipse.ui.part.ViewPart;
|
|||
|
||||
/**
|
||||
* This is the desktop view wrapper of the System View viewer.
|
||||
* ViewPart is from com.ibm.itp.ui.support.parts
|
||||
*/
|
||||
public class SystemCommandsViewPart
|
||||
extends ViewPart
|
||||
|
|
|
|||
|
|
@ -911,7 +911,6 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
|
|||
*/
|
||||
public boolean doRename(Shell shell, Object element, String name) throws Exception
|
||||
{
|
||||
//com.ibm.etools.systems.core.ui.SystemMessage.displayErrorMessage("INSIDE DORENAME");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes;
|
|||
public class SystemRemoteDirectoryMatcher extends SystemRemoteObjectMatcher
|
||||
{
|
||||
public static SystemRemoteDirectoryMatcher inst = null;
|
||||
//public static final String factoryId = com.ibm.etools.systems.as400filesubsys.FileSubSystemFactory.factoryId;
|
||||
public static final String category = ISystemFileRemoteTypes.TYPECATEGORY;
|
||||
public static final String type = ISystemFileRemoteTypes.TYPE_FOLDER;
|
||||
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
|
|||
* <p>
|
||||
* By default this returns Platform.getAdapterManager().getAdapter(this, adapterType);
|
||||
* This in turn results in the default subsystem adapter SystemViewSubSystemAdapter,
|
||||
* in package com.ibm.etools.systems.core.ui.view.
|
||||
* in package org.eclipse.rse.ui.view.
|
||||
*/
|
||||
public Object getAdapter(Class adapterType)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class RemoteFileChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ public class RemoteFileChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
package org.eclipse.rse.subsystems.files.core.subsystems;
|
||||
// copy all the following imports to your child class...
|
||||
// remote system framework packages...
|
||||
//import com.ibm.etools.systems.subsystems.impl.*;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.DataInputStream;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class RemoteFolderChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ public class RemoteFolderChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class RemoteSearchResultsContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ public class RemoteSearchResultsContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.ISystemContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@ public class Activator extends AbstractUIPlugin {
|
|||
* @return the image descriptor
|
||||
*/
|
||||
public static ImageDescriptor getImageDescriptor(String path) {
|
||||
return AbstractUIPlugin.imageDescriptorFromPlugin("com.ibm.rse.subsystems.files.ftp", path);
|
||||
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.ftp", path);
|
||||
}
|
||||
}
|
||||
|
|
@ -63,7 +63,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystemFactory#isFactoryFor(java.lang.Class)
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#isFactoryFor(java.lang.Class)
|
||||
*/
|
||||
public boolean isFactoryFor(Class subSystemType) {
|
||||
boolean isFor = FileServiceSubSystem.class.equals(subSystemType);
|
||||
|
|
@ -71,7 +71,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.files.subsystems.RemoteFileSubSystemFactory#supportsArchiveManagement()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration#supportsArchiveManagement()
|
||||
*/
|
||||
public boolean supportsArchiveManagement() {
|
||||
return true;
|
||||
|
|
@ -166,21 +166,21 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
|
|||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.files.subsystems.RemoteFileSubSystemFactory#supportsSearch()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration#supportsSearch()
|
||||
*/
|
||||
public boolean supportsSearch() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.files.subsystems.RemoteFileSubSystemFactory#supportsEnvironmentVariablesPropertyPage()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystemConfiguration#supportsEnvironmentVariablesPropertyPage()
|
||||
*/
|
||||
public boolean supportsEnvironmentVariablesPropertyPage() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystemFactory#supportsFilters()
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsFilters()
|
||||
*/
|
||||
public boolean supportsFilters() {
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class LocalJavaLanguageUtility extends AbstractJavaLanguageUtility {
|
|||
|
||||
/**
|
||||
* The given remote file must be an instance of <code>LocalFileImpl</code>.
|
||||
* @see com.ibm.etools.systems.subsystems.util.IJavaLanguageUtility#getQualifiedClassName(com.ibm.etools.systems.subsystems.IRemoteFile)
|
||||
* @see org.eclipse.rse.internal.subsystems.files.IJavaLanguageUtility#getQualifiedClassName(org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile)
|
||||
*/
|
||||
public String getQualifiedClassName(IRemoteFile remoteFile) {
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public class LocalLanguageUtilityFactory extends AbstractLanguageUtilityFactory
|
|||
}
|
||||
|
||||
/**
|
||||
* @see com.ibm.etools.systems.subsystems.util.ILanguageUtilityFactory#getUtility(java.lang.String)
|
||||
* @see org.eclipse.rse.internal.subsystems.files.core.ILanguageUtilityFactory#getUtility(java.lang.String)
|
||||
*/
|
||||
public ILanguageUtility getUtility(String language) {
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteFile#getComment()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile#getComment()
|
||||
*/
|
||||
public String getComment()
|
||||
{
|
||||
|
|
@ -135,7 +135,7 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteFile#getCompressedSize()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile#getCompressedSize()
|
||||
*/
|
||||
public long getCompressedSize()
|
||||
{
|
||||
|
|
@ -143,7 +143,7 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteFile#getCompressionMethod()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile#getCompressionMethod()
|
||||
*/
|
||||
public String getCompressionMethod()
|
||||
{
|
||||
|
|
@ -151,7 +151,7 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteFile#getCompressionRatio()
|
||||
* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile#getCompressionRatio()
|
||||
*/
|
||||
public double getCompressionRatio()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
/**
|
||||
* Constructor that takes a context object containing important information.
|
||||
* @param context An object holding contextual information about this object
|
||||
* @see com.ibm.etools.systems.shells.subsystems.IRemoteProcessContext
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessContext
|
||||
*/
|
||||
public RemoteProcessImpl(IRemoteProcessContext context, IHostProcess process)
|
||||
{
|
||||
|
|
@ -159,7 +159,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getPid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getPid()
|
||||
*/
|
||||
public long getPid()
|
||||
{
|
||||
|
|
@ -167,7 +167,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getPPid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getPPid()
|
||||
*/
|
||||
public long getPPid()
|
||||
{
|
||||
|
|
@ -175,7 +175,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getName()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getName()
|
||||
*/
|
||||
public String getName()
|
||||
{
|
||||
|
|
@ -183,7 +183,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getState()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getState()
|
||||
*/
|
||||
public String getState()
|
||||
{
|
||||
|
|
@ -191,7 +191,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getTgid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getTgid()
|
||||
*/
|
||||
public long getTgid()
|
||||
{
|
||||
|
|
@ -199,7 +199,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getTracerPid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getTracerPid()
|
||||
*/
|
||||
public long getTracerPid()
|
||||
{
|
||||
|
|
@ -207,7 +207,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getUid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getUid()
|
||||
*/
|
||||
public long getUid()
|
||||
{
|
||||
|
|
@ -215,7 +215,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getUsername()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getUsername()
|
||||
*/
|
||||
public String getUsername()
|
||||
{
|
||||
|
|
@ -223,7 +223,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getGid()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getGid()
|
||||
*/
|
||||
public long getGid()
|
||||
{
|
||||
|
|
@ -231,7 +231,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#isRoot()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#isRoot()
|
||||
*/
|
||||
public boolean isRoot()
|
||||
{
|
||||
|
|
@ -239,7 +239,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getAllProperties()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getAllProperties()
|
||||
*/
|
||||
public String getAllProperties()
|
||||
{
|
||||
|
|
@ -247,7 +247,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getVmSizeInKB()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getVmSizeInKB()
|
||||
*/
|
||||
public long getVmSizeInKB()
|
||||
{
|
||||
|
|
@ -255,7 +255,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getVmRSSInKB()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getVmRSSInKB()
|
||||
*/
|
||||
public long getVmRSSInKB()
|
||||
{
|
||||
|
|
@ -263,7 +263,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.processes.clientserver.IRemoteProcess#getLabel()
|
||||
* @see org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess#getLabel()
|
||||
*/
|
||||
public String getLabel()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class DStoreShellSubSystemConfiguration extends ShellServiceSubSystemConf
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystemFactory#isFactoryFor(java.lang.Class)
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#isFactoryFor(java.lang.Class)
|
||||
*/
|
||||
public boolean isFactoryFor(Class subSystemType) {
|
||||
boolean isFor = ShellServiceSubSystem.class.equals(subSystemType);
|
||||
|
|
@ -69,7 +69,7 @@ public class DStoreShellSubSystemConfiguration extends ShellServiceSubSystemConf
|
|||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystemFactory#supportsFilters()
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsFilters()
|
||||
*/
|
||||
public boolean supportsFilters() {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -43,11 +43,15 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
|
|||
import org.eclipse.jface.viewers.ISelectionProvider;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.ITreeContentProvider;
|
||||
import org.eclipse.jface.viewers.ITreePathContentProvider;
|
||||
import org.eclipse.jface.viewers.ITreeViewerListener;
|
||||
import org.eclipse.jface.viewers.SelectionChangedEvent;
|
||||
import org.eclipse.jface.viewers.StructuredSelection;
|
||||
import org.eclipse.jface.viewers.TreeExpansionEvent;
|
||||
import org.eclipse.jface.viewers.TreePath;
|
||||
import org.eclipse.jface.viewers.TreePathViewerSorter;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.eclipse.jface.viewers.ViewerComparator;
|
||||
import org.eclipse.jface.viewers.ViewerFilter;
|
||||
import org.eclipse.jface.window.SameShellProvider;
|
||||
import org.eclipse.rse.core.SystemAdapterHelpers;
|
||||
|
|
@ -5886,4 +5890,96 @@ public class SystemView extends TreeViewer implements ISystemTree,
|
|||
_setList.add(newSet);
|
||||
return newSet;
|
||||
}
|
||||
|
||||
|
||||
protected void internalAdd(Widget widget, Object parentElementOrTreePath, Object[] childElements) {
|
||||
Object parent;
|
||||
TreePath path;
|
||||
if (parentElementOrTreePath instanceof TreePath) {
|
||||
path = (TreePath) parentElementOrTreePath;
|
||||
parent = path.getLastSegment();
|
||||
} else {
|
||||
parent = parentElementOrTreePath;
|
||||
path = null;
|
||||
}
|
||||
|
||||
// optimization!
|
||||
// if the widget is not expanded we just invalidate the subtree
|
||||
if (widget instanceof Item) {
|
||||
Item ti = (Item) widget;
|
||||
if (!getExpanded(ti)) {
|
||||
boolean needDummy = isExpandable(ti, path, parent);
|
||||
boolean haveDummy = false;
|
||||
// remove all children
|
||||
Item[] items = getItems(ti);
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if (items[i].getData() != null) {
|
||||
disassociate(items[i]);
|
||||
items[i].dispose();
|
||||
} else {
|
||||
if (needDummy && !haveDummy) {
|
||||
haveDummy = true;
|
||||
} else {
|
||||
items[i].dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
// append a dummy if necessary
|
||||
if (needDummy && !haveDummy) {
|
||||
newItem(ti, SWT.NULL, -1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (childElements.length > 0) {
|
||||
// TODO: Add filtering back?
|
||||
Object[] filtered = filter(parentElementOrTreePath, childElements);
|
||||
|
||||
for (int i = 0; i < filtered.length; i++)
|
||||
{
|
||||
createTreeItem(widget, filtered[i], i);
|
||||
//createAddedElements(widget, filtered);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return whether the given element is expandable.
|
||||
* @param item the tree item for the element
|
||||
* @param parentPath the parent path if it is knwon or <code>null</code> if it needs to be determines
|
||||
* @param element the element
|
||||
* @return whether the given element is expandable
|
||||
*/
|
||||
private boolean isExpandable(Item item, TreePath parentPath, Object element) {
|
||||
return isExpandable(element);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the children elements.
|
||||
* @param parentElementOrTreePath the parent element or path
|
||||
* @param elements the child elements
|
||||
* @return the filter list of children
|
||||
*/
|
||||
private Object[] filter(Object parentElementOrTreePath, Object[] elements) {
|
||||
ViewerFilter[] filters = getFilters();
|
||||
if (filters != null) {
|
||||
ArrayList filtered = new ArrayList(elements.length);
|
||||
for (int i = 0; i < elements.length; i++) {
|
||||
boolean add = true;
|
||||
for (int j = 0; j < filters.length; j++) {
|
||||
add = filters[j].select(this, parentElementOrTreePath, elements[i]);
|
||||
if (!add) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (add) {
|
||||
filtered.add(elements[i]);
|
||||
}
|
||||
}
|
||||
return filtered.toArray();
|
||||
}
|
||||
return elements;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -396,8 +396,7 @@ public class Mnemonics
|
|||
Control children[] = parent.getChildren();
|
||||
if (children != null)
|
||||
{
|
||||
//com.ibm.etools.systems.SystemPlugin.getDefault().logMessage("setMnemonics: child count = " + children.length);
|
||||
Control currChild = null;
|
||||
Control currChild = null;
|
||||
boolean bSetText = false;
|
||||
for (int idx=0; idx < children.length; idx++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ import org.eclipse.rse.ui.RSEUIPlugin;
|
|||
import org.eclipse.rse.ui.SystemResources;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
||||
//import com.ibm.etools.systems.*;
|
||||
/**
|
||||
* This is the action for connecting all subsystems for a given connection.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ import org.eclipse.rse.ui.SystemResources;
|
|||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
||||
//import com.ibm.etools.systems.*;
|
||||
/**
|
||||
* This is the action forconnecting all subsystems for a given connection.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@
|
|||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.ui.actions;
|
||||
//import com.ibm.etools.systems.model.*;
|
||||
//import com.ibm.etools.systems.model.impl.*;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import org.eclipse.rse.ui.view.SystemView;
|
|||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
||||
//import com.ibm.etools.systems.subsystems.*;
|
||||
|
||||
/**
|
||||
* Base class for Expand To actions on a container
|
||||
|
|
|
|||
|
|
@ -60,9 +60,7 @@ import org.eclipse.swt.widgets.Shell;
|
|||
* <li>{@link #getSelectedConnection()}
|
||||
* </ul>
|
||||
*
|
||||
* @see com.ibm.etools.systems.files.ui.actions.SystemSelectRemoteFileAction
|
||||
* @see com.ibm.etools.systems.files.ui.actions.SystemSelectRemoteFolderAction
|
||||
*/
|
||||
*/
|
||||
public class SystemSelectConnectionDialog
|
||||
extends SystemPromptDialog implements ISystemPageCompleteListener
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@
|
|||
********************************************************************************/
|
||||
|
||||
package org.eclipse.rse.ui.filters.actions;
|
||||
//import com.ibm.etools.systems.model.*;
|
||||
//import com.ibm.etools.systems.model.impl.*;
|
||||
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.eclipse.rse.ui.ISystemContextMenuConstants;
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage imple
|
|||
return ok;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.filters.ui.ISystemFilterStringEditPaneListener#filterStringChanged(org.eclipse.rse.core.ui.messages.SystemMessage)
|
||||
* @see org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener#filterStringChanged(org.eclipse.rse.core.ui.messages.SystemMessage)
|
||||
*/
|
||||
public void filterStringChanged(SystemMessage message)
|
||||
{
|
||||
|
|
@ -325,13 +325,13 @@ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage imple
|
|||
setErrorMessage(message);
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.filters.ui.ISystemFilterStringEditPaneListener#backupChangedState()
|
||||
* @see org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener#backupChangedState()
|
||||
*/
|
||||
public void backupChangedState()
|
||||
{
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.filters.ui.ISystemFilterStringEditPaneListener#restoreChangedState()
|
||||
* @see org.eclipse.rse.ui.filters.ISystemFilterStringEditPaneListener#restoreChangedState()
|
||||
*/
|
||||
public void restoreChangedState()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
|
|||
public class SystemLoggingPreferencePage extends LoggingPreferencePage {
|
||||
|
||||
/**
|
||||
* @see com.ibm.etools.systems.logging.LoggingPreferencePage#getPlugin()
|
||||
* @see org.eclipse.rse.logging.LoggingPreferencePage#getPlugin()
|
||||
*/
|
||||
protected AbstractUIPlugin getPlugin() {
|
||||
return RSEUIPlugin.getDefault();
|
||||
|
|
|
|||
|
|
@ -43,11 +43,15 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
|
|||
import org.eclipse.jface.viewers.ISelectionProvider;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.ITreeContentProvider;
|
||||
import org.eclipse.jface.viewers.ITreePathContentProvider;
|
||||
import org.eclipse.jface.viewers.ITreeViewerListener;
|
||||
import org.eclipse.jface.viewers.SelectionChangedEvent;
|
||||
import org.eclipse.jface.viewers.StructuredSelection;
|
||||
import org.eclipse.jface.viewers.TreeExpansionEvent;
|
||||
import org.eclipse.jface.viewers.TreePath;
|
||||
import org.eclipse.jface.viewers.TreePathViewerSorter;
|
||||
import org.eclipse.jface.viewers.TreeViewer;
|
||||
import org.eclipse.jface.viewers.ViewerComparator;
|
||||
import org.eclipse.jface.viewers.ViewerFilter;
|
||||
import org.eclipse.jface.window.SameShellProvider;
|
||||
import org.eclipse.rse.core.SystemAdapterHelpers;
|
||||
|
|
@ -5886,4 +5890,96 @@ public class SystemView extends TreeViewer implements ISystemTree,
|
|||
_setList.add(newSet);
|
||||
return newSet;
|
||||
}
|
||||
|
||||
|
||||
protected void internalAdd(Widget widget, Object parentElementOrTreePath, Object[] childElements) {
|
||||
Object parent;
|
||||
TreePath path;
|
||||
if (parentElementOrTreePath instanceof TreePath) {
|
||||
path = (TreePath) parentElementOrTreePath;
|
||||
parent = path.getLastSegment();
|
||||
} else {
|
||||
parent = parentElementOrTreePath;
|
||||
path = null;
|
||||
}
|
||||
|
||||
// optimization!
|
||||
// if the widget is not expanded we just invalidate the subtree
|
||||
if (widget instanceof Item) {
|
||||
Item ti = (Item) widget;
|
||||
if (!getExpanded(ti)) {
|
||||
boolean needDummy = isExpandable(ti, path, parent);
|
||||
boolean haveDummy = false;
|
||||
// remove all children
|
||||
Item[] items = getItems(ti);
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if (items[i].getData() != null) {
|
||||
disassociate(items[i]);
|
||||
items[i].dispose();
|
||||
} else {
|
||||
if (needDummy && !haveDummy) {
|
||||
haveDummy = true;
|
||||
} else {
|
||||
items[i].dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
// append a dummy if necessary
|
||||
if (needDummy && !haveDummy) {
|
||||
newItem(ti, SWT.NULL, -1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (childElements.length > 0) {
|
||||
// TODO: Add filtering back?
|
||||
Object[] filtered = filter(parentElementOrTreePath, childElements);
|
||||
|
||||
for (int i = 0; i < filtered.length; i++)
|
||||
{
|
||||
createTreeItem(widget, filtered[i], i);
|
||||
//createAddedElements(widget, filtered);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return whether the given element is expandable.
|
||||
* @param item the tree item for the element
|
||||
* @param parentPath the parent path if it is knwon or <code>null</code> if it needs to be determines
|
||||
* @param element the element
|
||||
* @return whether the given element is expandable
|
||||
*/
|
||||
private boolean isExpandable(Item item, TreePath parentPath, Object element) {
|
||||
return isExpandable(element);
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the children elements.
|
||||
* @param parentElementOrTreePath the parent element or path
|
||||
* @param elements the child elements
|
||||
* @return the filter list of children
|
||||
*/
|
||||
private Object[] filter(Object parentElementOrTreePath, Object[] elements) {
|
||||
ViewerFilter[] filters = getFilters();
|
||||
if (filters != null) {
|
||||
ArrayList filtered = new ArrayList(elements.length);
|
||||
for (int i = 0; i < elements.length; i++) {
|
||||
boolean add = true;
|
||||
for (int j = 0; j < filters.length; j++) {
|
||||
add = filters[j].select(this, parentElementOrTreePath, elements[i]);
|
||||
if (!add) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (add) {
|
||||
filtered.add(elements[i]);
|
||||
}
|
||||
}
|
||||
return filtered.toArray();
|
||||
}
|
||||
return elements;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -31,7 +31,6 @@ import org.eclipse.swt.widgets.Composite;
|
|||
|
||||
/**
|
||||
* This is the desktop view wrapper of the System View viewer.
|
||||
* ViewPart is from com.ibm.itp.ui.support.parts
|
||||
*/
|
||||
public class MonitorViewWorkbook extends Composite
|
||||
{
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor;
|
|||
|
||||
/**
|
||||
* This is the desktop view wrapper of the System View viewer.
|
||||
* ViewPart is from com.ibm.itp.ui.support.parts
|
||||
*/
|
||||
public class SystemMonitorViewPart
|
||||
extends ViewPart
|
||||
|
|
|
|||
|
|
@ -110,8 +110,6 @@ import org.eclipse.ui.part.PluginTransfer;
|
|||
* This subclass of the standard JFace tabletree viewer is used to
|
||||
* show a generic tabletree view of the selected object
|
||||
* <p>
|
||||
*
|
||||
* TableViewer comes from com.ibm.jface.viewer
|
||||
*/
|
||||
public class SystemScratchpadView
|
||||
// TODO change TreeViewer to ScratchpadViewer when Eclipse fixes SWT viewer
|
||||
|
|
@ -895,7 +893,6 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
|
|||
for (int idx = 0; idx < deleted.length; idx++)
|
||||
deleted[idx] = deletedVector.elementAt(idx);
|
||||
if (_selectionIsRemoteObject)
|
||||
//sr.fireEvent(new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvent.EVENT_DELETE_REMOTE_MANY, null));
|
||||
sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this);
|
||||
else
|
||||
sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput()));
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public class SystemSearchCopyToClipboardAction extends SystemCopyToClipboardActi
|
|||
/**
|
||||
* Returns the string "\t" if the object is a remote search result, otherwise returns the super class
|
||||
* implementation.
|
||||
* @see com.ibm.etools.systems.files.ui.actions.SystemCopyToClipboardAction#getTextTransferPrepend(java.lang.Object, org.eclipse.rse.ui.view.ISystemViewElementAdapter)
|
||||
* @see org.eclipse.rse.ui.actions.SystemCopyToClipboardAction#getTextTransferPrepend(java.lang.Object, org.eclipse.rse.ui.view.ISystemViewElementAdapter)
|
||||
*/
|
||||
protected String getTextTransferPrepend(Object obj, ISystemViewElementAdapter adapter) {
|
||||
/** shouldn't be coupled with search (files ui)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(com.ibm.etools.systems.model.SystemConnection)
|
||||
* @see org.eclipse.rse.ui.view.ISystemViewInputProvider#getConnectionChildren(org.eclipse.rse.model.IHost)
|
||||
*/
|
||||
public Object[] getConnectionChildren(IHost selectedConnection)
|
||||
{
|
||||
|
|
@ -102,7 +102,7 @@ public class SystemTeamViewInputProvider implements IAdaptable, ISystemViewInput
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(com.ibm.etools.systems.model.SystemConnection)
|
||||
* @see org.eclipse.rse.ui.view.ISystemViewInputProvider#hasConnectionChildren(org.eclipse.rse.model.IHost)
|
||||
*/
|
||||
public boolean hasConnectionChildren(IHost selectedConnection)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.model.ISystemContainer#hasContents(com.ibm.etools.systems.model.ISystemContentsType)
|
||||
* @see org.eclipse.rse.model.ISystemContainer#hasContents(org.eclipse.rse.model.ISystemContentsType)
|
||||
*/
|
||||
public boolean hasContents(ISystemContentsType contentsType)
|
||||
{
|
||||
|
|
@ -426,7 +426,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
return false;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.model.ISystemContainer#getContents(com.ibm.etools.systems.model.ISystemContentsType)
|
||||
* @see org.eclipse.rse.model.ISystemContainer#getContents(org.eclipse.rse.model.ISystemContentsType)
|
||||
*/
|
||||
public Object[] getContents(ISystemContentsType contentsType)
|
||||
{
|
||||
|
|
@ -441,7 +441,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.model.ISystemContainer#isStale()
|
||||
* @see org.eclipse.rse.model.ISystemContainer#isStale()
|
||||
*/
|
||||
public boolean isStale()
|
||||
{
|
||||
|
|
@ -449,7 +449,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.model.ISystemContainer#markStale(boolean)
|
||||
* @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
|
||||
*/
|
||||
public void markStale(boolean isStale)
|
||||
{
|
||||
|
|
@ -457,7 +457,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.model.ISystemContainer#markStale(boolean)
|
||||
* @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
|
||||
*/
|
||||
public void markStale(boolean isStale, boolean clearCache)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -92,9 +92,9 @@ import org.eclipse.rse.ui.RSEUIPlugin;
|
|||
* filter related activity through a single point like this, we can ensure that
|
||||
* all changes are saved to disk, and events are fired properly.
|
||||
* <p>
|
||||
* The filter framework logs to a {@link com.ibm.etools.systems.logging.Logger Logger} file.
|
||||
* The filter framework logs to a {@link org.eclipse.rse.logging.Logger Logger} file.
|
||||
* By default the log in the org.eclipse.rse.core plugin is used, but you can change this
|
||||
* by calling {@link #setLogger(com.ibm.etools.systems.logging.Logger)}.
|
||||
* by calling {@link #setLogger(org.eclipse.rse.logging.Logger)}.
|
||||
*/
|
||||
/**
|
||||
* @lastgen class SystemFilterPoolManagerImpl Impl implements SystemFilterPoolManager {}
|
||||
|
|
|
|||
|
|
@ -956,9 +956,7 @@ public class SystemFilterPoolReferenceManager extends SystemPersistableReference
|
|||
{
|
||||
setSystemFilterPoolManagerProvider(relatedPoolMgrProvider); // sets poolMgrs = relatedManagers
|
||||
setProvider(provider);
|
||||
//com.ibm.etools.systems.subsystems.SubSystem ss = (com.ibm.etools.systems.subsystems.SubSystem)provider;
|
||||
//System.out.println("Inside resolveReferencesAfterRestore for subsys " +getName() + " in conn " + ss.getSystemProfile() + "." + ss.getSystemConnection());
|
||||
ISystemFilterPoolManager[] relatedManagers = getSystemFilterPoolManagers();
|
||||
ISystemFilterPoolManager[] relatedManagers = getSystemFilterPoolManagers();
|
||||
if (relatedManagers != null)
|
||||
{
|
||||
Vector badRefs = new Vector();
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class SystemChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ public class SystemChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public class SystemFilterStringContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -37,7 +37,7 @@ public class SystemFilterStringContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class RemoteChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#getType()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#getType()
|
||||
*/
|
||||
public String getType()
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ public class RemoteChildrenContentsType implements ISystemContentsType
|
|||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.IRemoteContentsType#isPersistent()
|
||||
* @see org.eclipse.rse.model.IRemoteContentsType#isPersistent()
|
||||
*/
|
||||
public boolean isPersistent()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ import org.eclipse.ui.progress.WorkbenchJob;
|
|||
* This class is designed to be subclassed. Its role is three-fold:
|
||||
* <ol>
|
||||
* <li>Storing of tool-specific persistent properties per connection.
|
||||
* <li>Accessing of an {@com.ibm.etools.systems.subsystems.ISystem ISystem} object to enable the subsystem's connect and disconnect actions.
|
||||
* <li>Accessing of an IConnectorService object to enable the subsystem's connect and disconnect actions.
|
||||
* <li>Doing actual remote accessing. This usually just involves overriding the <code>internalResolveFilterString</code> methods to
|
||||
* populate the remote resources shown when the subsystem's filters are expanded. It might also involve overriding the inherited
|
||||
* <code>internalRunCommand</code> method if this subsystem supports running commands remotely... although typically such subsystems
|
||||
|
|
@ -669,7 +669,6 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
// System.out.println("ProfileName: " + profileName);
|
||||
// System.out.println("ConnectionName: " + connectionName);
|
||||
|
||||
// RESID_PERCONNECTION_FILTERPOOL = com.ibm.etools.systems.ui.perConnection.filterpool=Filter Pool for connection %1
|
||||
// String name = SystemResources.RESID_PERCONNECTION_FILTERPOOL;
|
||||
//
|
||||
// StringBuffer profileNameBuffer = new StringBuffer(profileName.toLowerCase());
|
||||
|
|
@ -3272,14 +3271,14 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
|||
return null;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystem#isConnectionError()
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystem#isConnectionError()
|
||||
*/
|
||||
public boolean isConnectionError()
|
||||
{
|
||||
return _connectionError;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see com.ibm.etools.systems.subsystems.SubSystem#setConnectionError(boolean)
|
||||
* @see org.eclipse.rse.core.subsystems.SubSystem#setConnectionError(boolean)
|
||||
*/
|
||||
public void setConnectionError(boolean error)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -619,22 +619,6 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
|
|||
RSEUIPlugin.getTheSystemRegistry().fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(ss, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, ss));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* If we support filters, should we show filter strings in the remote system explorer?
|
||||
* This is to set it after the user changes it in the user preferences. It may require
|
||||
* refreshing the current view.
|
||||
*
|
||||
public void setShowFilterStrings(boolean show)
|
||||
{
|
||||
SubSystem[] subsystems = getSubSystems(false); // false=> lazy get; don't restore from disk if not already
|
||||
for (int idx=0; idx<subsystems.length; idx++)
|
||||
{
|
||||
SubSystem ss = subsystems[idx];
|
||||
RSEUIPlugin.getTheSystemRegistry().fireEvent(
|
||||
new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
|
||||
ss,ISystemResourceChangeEvent.EVENT_CHANGE_CHILDREN,ss));
|
||||
}
|
||||
}*/
|
||||
|
||||
// ---------------------------------
|
||||
// PROXY METHODS. USED INTERNALLY...
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue