Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFLaunchContext.java6
-rw-r--r--plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java7
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFNodeAdapterFactory.java5
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLoginPage.java29
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPaneFactory.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFMemoryBlockRetrieval.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java5
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java6
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java22
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java5
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java4
18 files changed, 61 insertions, 47 deletions
diff --git a/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFLaunchContext.java b/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFLaunchContext.java
index 2e45ede03..9003cb3fd 100644
--- a/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFLaunchContext.java
+++ b/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFLaunchContext.java
@@ -253,10 +253,10 @@ public class TCFLaunchContext implements ITCFLaunchContext {
* @throws CoreException
*/
public boolean isBinary(IProject project, IPath path) throws CoreException {
- ICExtensionReference[] parserRef = CCorePlugin.getDefault().getBinaryParserExtensions(project);
- for (int i = 0; i < parserRef.length; i++) {
+ ICExtensionReference[] refs = CCorePlugin.getDefault().getBinaryParserExtensions(project);
+ for (int i = 0; i < refs.length; i++) {
try {
- IBinaryParser parser = (IBinaryParser)parserRef[i].createExtension();
+ IBinaryParser parser = (IBinaryParser)refs[i].createExtension();
if (parser.getBinary(path) != null) return true;
}
catch (Exception e) {
diff --git a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java
index 078c01e21..41f873a33 100644
--- a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java
+++ b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/tcf/protocol/JSON.java
@@ -449,7 +449,7 @@ public final class JSON {
* Clients should not call this method directly, except from ObjectWriter implementation.
* @param o - an object to write
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public static void writeObject(Object o) throws IOException {
if (o == null) {
write("null");
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java
index fe331f5c7..7bb5dc9b9 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchAdapterFactory.java
@@ -23,8 +23,7 @@ import org.eclipse.tm.tcf.util.TCFTask;
public class TCFLaunchAdapterFactory implements IAdapterFactory {
- @SuppressWarnings("unchecked")
- private static final Class[] adapter_list = {
+ private static final Class<?>[] adapter_list = {
IElementLabelProvider.class,
IElementContentProvider.class,
IModelProxyFactory.class,
@@ -33,7 +32,7 @@ public class TCFLaunchAdapterFactory implements IAdapterFactory {
private static final IElementLabelProvider launch_label_provider = new TCFLaunchLabelProvider();
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(final Object from, final Class to) {
if (from instanceof TCFLaunch) {
if (to == IElementLabelProvider.class) return launch_label_provider;
@@ -52,7 +51,7 @@ public class TCFLaunchAdapterFactory implements IAdapterFactory {
return null;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class[] getAdapterList() {
return adapter_list;
}
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFNodeAdapterFactory.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFNodeAdapterFactory.java
index 53d9bb042..92cbfce1a 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFNodeAdapterFactory.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFNodeAdapterFactory.java
@@ -26,7 +26,7 @@ public class TCFNodeAdapterFactory implements IAdapterFactory {
private final BreakpointCommand breakpoint_command = new BreakpointCommand();
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Object obj, Class cls) {
if (obj instanceof TCFNode) {
if (cls == IToggleBreakpointsTarget.class) return breakpoint_command;
@@ -35,7 +35,8 @@ public class TCFNodeAdapterFactory implements IAdapterFactory {
return null;
}
- public Class<?>[] getAdapterList() {
+ @SuppressWarnings("rawtypes")
+ public Class[] getAdapterList() {
return adapter_list;
}
}
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLoginPage.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLoginPage.java
index c9079e20f..313ef8389 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLoginPage.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLoginPage.java
@@ -14,7 +14,10 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IPreferencesService;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.IPreferencePage;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferenceManager;
@@ -66,10 +69,10 @@ class WizardLoginPage extends WizardPage implements Listener {
public void handleEvent(Event event) {
getContainer().updateButtons();
- Preferences p = Activator.getDefault().getPluginPreferences();
- p.setValue(PREF_PROTOCOL, protocol.getText());
- p.setValue(PREF_HOST, host.getText());
- p.setValue(PREF_USER, user.getText());
+ IEclipsePreferences n = new InstanceScope().getNode(Activator.PLUGIN_ID);
+ n.put(PREF_PROTOCOL, protocol.getText());
+ n.put(PREF_HOST, host.getText());
+ n.put(PREF_USER, user.getText());
root_password.setEnabled(!user.getText().equals("root"));
prefs.setEnabled(protocol.getText().equals(protocols[1]));
@@ -140,11 +143,14 @@ class WizardLoginPage extends WizardPage implements Listener {
root_password.setLayoutData(gd);
root_password.addListener(SWT.KeyUp, this);
- Preferences p = Activator.getDefault().getPluginPreferences();
- p.setDefault(PREF_PROTOCOL, protocols[0]);
- protocol.setText(p.getString(PREF_PROTOCOL));
- host.setText(p.getString(PREF_HOST));
- user.setText(p.getString(PREF_USER));
+ IEclipsePreferences d = new DefaultScope().getNode(Activator.PLUGIN_ID);
+ d.put(PREF_PROTOCOL, protocols[0]);
+
+ IEclipsePreferences[] n = { new InstanceScope().getNode(Activator.PLUGIN_ID) };
+ IPreferencesService s = Platform.getPreferencesService();
+ protocol.setText(s.get(PREF_PROTOCOL, "", n));
+ host.setText(s.get(PREF_HOST, "", n));
+ user.setText(s.get(PREF_USER, "", n));
root_password.setEnabled(!user.getText().equals("root"));
prefs.setEnabled(protocol.getText().equals(protocols[1]));
@@ -152,7 +158,6 @@ class WizardLoginPage extends WizardPage implements Listener {
setControl(composite);
}
- @SuppressWarnings("unchecked")
private void openProtocolPreferences(Shell shell, String title) {
try {
PreferenceManager mgr = new PreferenceManager();
@@ -169,7 +174,7 @@ class WizardLoginPage extends WizardPage implements Listener {
String id = e[j].getAttribute("id"); //$NON-NLS-1$
if (id == null) id = cnm;
Bundle bundle = Platform.getBundle(extensions[i].getNamespaceIdentifier());
- Class c = bundle.loadClass(cnm);
+ Class<?> c = bundle.loadClass(cnm);
IPreferencePage page = (IPreferencePage)c.newInstance();
String pnm = e[j].getAttribute("name"); //$NON-NLS-1$
if (pnm != null) page.setTitle(pnm);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPaneFactory.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPaneFactory.java
index 4d5a8b430..e7a6d4fc5 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPaneFactory.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPaneFactory.java
@@ -40,7 +40,7 @@ public class TCFDetailPaneFactory implements IDetailPaneFactory {
return TCFDetailPane.DESC;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Set getDetailPaneTypes(IStructuredSelection selection) {
HashSet<String> set = new HashSet<String>();
set.add(TCFDetailPane.ID);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFMemoryBlockRetrieval.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFMemoryBlockRetrieval.java
index 615f56654..f9124777a 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFMemoryBlockRetrieval.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFMemoryBlockRetrieval.java
@@ -354,8 +354,8 @@ class TCFMemoryBlockRetrieval implements IMemoryBlockRetrievalExtension {
return ITCFConstants.ID_TCF_DEBUG_MODEL;
}
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
if (adapter == IMemoryBlockRetrieval.class) return TCFMemoryBlockRetrieval.this;
if (adapter == IMemoryBlockRetrievalExtension.class) return TCFMemoryBlockRetrieval.this;
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
index 062cd44cf..af9c856bb 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
@@ -134,8 +134,7 @@ public class TCFModel implements IElementContentProvider, IElementLabelProvider,
private final Map<String,TCFNode> id2node = new HashMap<String,TCFNode>();
- @SuppressWarnings("unchecked")
- private final Map<Class,Object> adapters = new HashMap<Class,Object>();
+ private final Map<Class<?>,Object> adapters = new HashMap<Class<?>,Object>();
private final Map<String,IMemoryBlockRetrievalExtension> mem_retrieval =
new HashMap<String,IMemoryBlockRetrievalExtension>();
@@ -402,7 +401,7 @@ public class TCFModel implements IElementContentProvider, IElementLabelProvider,
adapters.put(IStepReturnHandler.class, new StepReturnCommand(this));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(final Class adapter, final TCFNode node) {
synchronized (adapters) {
Object o = adapters.get(adapter);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
index cb1ea78a4..1ea777143 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
@@ -129,7 +129,7 @@ public abstract class TCFNode extends PlatformObject implements Comparable<TCFNo
* @see IAdaptable#getAdapter(Class)
*/
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(final Class adapter) {
if (adapter.isInstance(model)) return model;
Object o = model.getAdapter(adapter, TCFNode.this);
diff --git a/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
index 8ff00cef8..a3eebd7e5 100644
--- a/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Activator: org.eclipse.tm.internal.tcf.debug.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.debug.core,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.eclipse.core.filesystem;bundle-version="1.2.0"
Import-Package: org.eclipse.tm.tcf.core;version="0.3.0",
org.eclipse.tm.tcf.protocol;version="0.3.0",
org.eclipse.tm.tcf.services;version="0.3.0",
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java
index bb46e881b..0c50b431b 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFLaunchDelegate.java
@@ -206,19 +206,19 @@ public class TCFLaunchDelegate extends LaunchConfigurationDelegate {
final ILaunch launch, final IProgressMonitor monitor) throws CoreException {
String local_id = null;
int task_cnt = 1;
- if (configuration.getAttribute(TCFLaunchDelegate.ATTR_RUN_LOCAL_AGENT, true)) {
+ if (configuration.getAttribute(ATTR_RUN_LOCAL_AGENT, true)) {
task_cnt++;
if (monitor != null) monitor.beginTask("Starting TCF Agent", task_cnt); //$NON-NLS-1$
local_id = TCFLocalAgent.runLocalAgent();
}
- else if (configuration.getAttribute(TCFLaunchDelegate.ATTR_USE_LOCAL_AGENT, true)) {
+ else if (configuration.getAttribute(ATTR_USE_LOCAL_AGENT, true)) {
task_cnt++;
if (monitor != null) monitor.beginTask("Searching TCF Agent", task_cnt); //$NON-NLS-1$
local_id = TCFLocalAgent.getLocalAgentID();
}
if (monitor != null) monitor.beginTask("Launching TCF debugger session", task_cnt); //$NON-NLS-1$
final String id =
- configuration.getAttribute(TCFLaunchDelegate.ATTR_USE_LOCAL_AGENT, true) ?
+ configuration.getAttribute(ATTR_USE_LOCAL_AGENT, true) ?
local_id : configuration.getAttribute(ATTR_PEER_ID, "");
Protocol.invokeLater(new Runnable() {
public void run() {
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java
index 3aae53472..731ae9c83 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupParticipant.java
@@ -11,15 +11,17 @@
package org.eclipse.tm.internal.tcf.debug.launch;
import java.io.File;
+import java.net.URI;
import java.util.ArrayList;
+import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IStorage;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
import org.eclipse.tm.tcf.services.ILineNumbers;
/**
@@ -53,7 +55,8 @@ public class TCFSourceLookupParticipant extends AbstractSourceLookupParticipant
if (name != null) {
IPath path = new Path(name);
if (path.isAbsolute()) {
- IFile[] arr = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+ URI uri = URIUtil.toURI(path);
+ IFile[] arr = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(uri);
if (arr != null && arr.length > 0) return arr;
}
}
@@ -69,12 +72,15 @@ public class TCFSourceLookupParticipant extends AbstractSourceLookupParticipant
}
ArrayList<Object> list = new ArrayList<Object>();
for (Object o : res) {
- if (o instanceof LocalFileStorage) {
- IPath path = ((LocalFileStorage)o).getFullPath();
- IFile[] arr = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
- if (arr != null && arr.length > 0) {
- for (Object x : arr) list.add(x);
- continue;
+ if (o instanceof IStorage) {
+ IPath path = ((IStorage)o).getFullPath();
+ if (path != null) {
+ URI uri = URIUtil.toURI(path);
+ IFile[] arr = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(uri);
+ if (arr != null && arr.length > 0) {
+ for (Object x : arr) list.add(x);
+ continue;
+ }
}
}
list.add(o);
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java
index c7c28e668..2b5b74776 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourcePathComputerDelegate.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.tm.internal.tcf.debug.launch;
+import java.net.URI;
import java.util.ArrayList;
import java.util.HashSet;
@@ -19,6 +20,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
@@ -41,7 +43,8 @@ public class TCFSourcePathComputerDelegate implements ISourcePathComputerDelegat
String program_name = configuration.getAttribute(TCFLaunchDelegate.ATTR_LOCAL_PROGRAM_FILE, (String)null);
String path = TCFLaunchDelegate.getProgramPath(project_name, program_name);
if (path != null) {
- IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(path));
+ URI uri = URIUtil.toURI(new Path(path));
+ IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(uri);
if (files != null && files.length > 0) {
HashSet<IProject> projects = new HashSet<IProject>();
for (IFile file : files) projects.add(file.getProject());
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
index 714c1bcb5..b2dd59118 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
@@ -400,7 +400,7 @@ public class TCFLaunch extends Launch {
}
final String dir = cfg.getAttribute(TCFLaunchDelegate.ATTR_WORKING_DIRECTORY, "");
final String args = cfg.getAttribute(TCFLaunchDelegate.ATTR_PROGRAM_ARGUMENTS, "");
- final Map<String,String> env = cfg.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map)null);
+ final Map<String,String> env = cfg.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map<String,String>)null);
// Start the process
new LaunchStep() {
@Override
diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java
index cadfbc5de..25b423710 100644
--- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java
+++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorServiceManager.java
@@ -28,8 +28,8 @@ public class TCFConnectorServiceManager extends AbstractConnectorServiceManager
return new TCFConnectorService(host, TCF_PORT);
}
- @SuppressWarnings("unchecked")
@Override
+ @SuppressWarnings("rawtypes")
public Class getSubSystemCommonInterface(ISubSystem subsystem) {
return ITCFSubSystem.class;
}
diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java
index 9d19680b9..90ad101a7 100644
--- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java
@@ -82,7 +82,7 @@ public class TCFFileSubSystemConfiguration extends FileServiceSubSystemConfigura
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getServiceImplType() {
return TCFFileService.class;
}
diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java
index 209b43210..6799254d5 100644
--- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java
@@ -27,7 +27,7 @@ public class TCFProcessSubSystemConfiguration extends ProcessServiceSubSystemCon
private final TCFProcessAdapter process_adapter = new TCFProcessAdapter();
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class getServiceImplType() {
return TCFProcessService.class;
}
diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java
index 2b1707220..7a9b1771a 100644
--- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java
+++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFSystemViewProcessAdapterFactory.java
@@ -25,7 +25,7 @@ public class TCFSystemViewProcessAdapterFactory implements IAdapterFactory {
private final TCFSystemViewRemoteProcessAdapter adapter =
new TCFSystemViewRemoteProcessAdapter();
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Object adaptableObject, Class adapterType) {
assert adaptableObject instanceof TCFRemoteProcess;
if (adapterType == IPropertySource.class) {
@@ -34,7 +34,7 @@ public class TCFSystemViewProcessAdapterFactory implements IAdapterFactory {
return adapter;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Class[] getAdapterList() {
return new Class[] {
ISystemViewElementAdapter.class,

Back to the top