author | stechong |
Thu, 25 Feb 2010 23:36:03 -0600 | |
changeset 137 | f800d58f08b0 |
parent 135 | 6f8730b7758d |
permissions | -rw-r--r-- |
37 | 1 |
/******************************************************************************* |
2 |
* Copyright (c) 2008 Nokia and others. |
|
3 |
* All rights reserved. This program and the accompanying materials |
|
4 |
* are made available under the terms of the Eclipse Public License v1.0 |
|
5 |
* which accompanies this distribution, and is available at |
|
6 |
* http://www.eclipse.org/legal/epl-v10.html |
|
7 |
* |
|
8 |
* Contributors: |
|
9 |
* Nokia - Initial API and implementation |
|
10 |
*******************************************************************************/ |
|
11 |
||
12 |
package org.eclipse.cdt.debug.core.executables; |
|
13 |
||
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
14 |
import java.text.DateFormat; |
37 | 15 |
import java.util.ArrayList; |
16 |
import java.util.Collection; |
|
17 |
import java.util.Collections; |
|
18 |
import java.util.Comparator; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
19 |
import java.util.Date; |
37 | 20 |
import java.util.HashMap; |
21 |
import java.util.List; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
22 |
import java.util.Map; |
37 | 23 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
24 |
import org.eclipse.cdt.core.model.CoreModel; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
25 |
import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
26 |
import org.eclipse.cdt.core.settings.model.ICProjectDescription; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
27 |
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener; |
37 | 28 |
import org.eclipse.cdt.debug.core.CDebugCorePlugin; |
29 |
import org.eclipse.cdt.debug.internal.core.executables.StandardExecutableImporter; |
|
30 |
import org.eclipse.cdt.debug.internal.core.executables.StandardSourceFileRemapping; |
|
31 |
import org.eclipse.cdt.debug.internal.core.executables.StandardSourceFilesProvider; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
32 |
import org.eclipse.core.resources.IProject; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
33 |
import org.eclipse.core.resources.IProjectDescription; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
34 |
import org.eclipse.core.resources.IResource; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
35 |
import org.eclipse.core.resources.IResourceChangeEvent; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
36 |
import org.eclipse.core.resources.IResourceChangeListener; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
37 |
import org.eclipse.core.resources.IResourceDelta; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
38 |
import org.eclipse.core.resources.IResourceDeltaVisitor; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
39 |
import org.eclipse.core.resources.ResourcesPlugin; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
40 |
import org.eclipse.core.runtime.CoreException; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
41 |
import org.eclipse.core.runtime.IConfigurationElement; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
42 |
import org.eclipse.core.runtime.IExtension; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
43 |
import org.eclipse.core.runtime.IExtensionPoint; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
44 |
import org.eclipse.core.runtime.IExtensionRegistry; |
37 | 45 |
import org.eclipse.core.runtime.IPath; |
46 |
import org.eclipse.core.runtime.IProgressMonitor; |
|
47 |
import org.eclipse.core.runtime.IStatus; |
|
48 |
import org.eclipse.core.runtime.MultiStatus; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
49 |
import org.eclipse.core.runtime.Platform; |
37 | 50 |
import org.eclipse.core.runtime.PlatformObject; |
51 |
import org.eclipse.core.runtime.Status; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
52 |
import org.eclipse.core.runtime.SubMonitor; |
37 | 53 |
import org.eclipse.core.runtime.SubProgressMonitor; |
54 |
import org.eclipse.core.runtime.jobs.Job; |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
55 |
import org.eclipse.osgi.service.debug.DebugOptions; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
56 |
import org.osgi.framework.BundleContext; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
57 |
import org.osgi.framework.ServiceReference; |
37 | 58 |
|
59 |
/** |
|
60 |
* The Executables Manager maintains a collection of executables built by all of |
|
61 |
* the projects in the workspace. Executables are contributed by instances of |
|
62 |
* IExecutablesProvider. |
|
63 |
* |
|
64 |
* @author Ken Ryall |
|
65 |
* |
|
66 |
*/ |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
67 |
public class ExecutablesManager extends PlatformObject implements IResourceChangeListener, ICProjectDescriptionListener { |
37 | 68 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
69 |
private static final String EXECUTABLES_MANAGER_DEBUG_TRACING = CDebugCorePlugin.PLUGIN_ID + "EXECUTABLES_MANAGER_DEBUG_TRACING"; //$NON-NLS-1$ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
70 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
71 |
private Map<IProject, IProjectExecutablesProvider> executablesProviderMap = new HashMap<IProject, IProjectExecutablesProvider>(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
72 |
private Map<IProject, List<Executable>> executablesMap = new HashMap<IProject, List<Executable>>(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
73 |
private List<IExecutablesChangeListener> changeListeners = Collections.synchronizedList(new ArrayList<IExecutablesChangeListener>()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
74 |
private List<IProjectExecutablesProvider> executableProviders; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
75 |
private List<ISourceFilesProvider> sourceFileProviders; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
76 |
private List<ISourceFileRemapping> sourceFileRemappings; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
77 |
private List<IExecutableImporter> executableImporters; |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
78 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
79 |
private boolean DEBUG; |
37 | 80 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
81 |
private Job refreshJob = new Job("Get Executables") { |
37 | 82 |
|
83 |
@Override |
|
84 |
public IStatus run(IProgressMonitor monitor) { |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
85 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
86 |
trace("Get Executables job started at " + getStringFromTimestamp(System.currentTimeMillis())); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
87 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
88 |
List<IProject> projects = getProjectsToCheck(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
89 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
90 |
SubMonitor subMonitor = SubMonitor.convert(monitor, projects.size()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
91 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
92 |
for (IProject project : projects) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
93 |
if (subMonitor.isCanceled()) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
94 |
trace("Get Executables job cancelled at " + getStringFromTimestamp(System.currentTimeMillis())); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
95 |
return Status.CANCEL_STATUS; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
96 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
97 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
98 |
subMonitor.subTask("Checking project: " + project.getName()); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
99 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
100 |
// get the executables provider for this project |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
101 |
IProjectExecutablesProvider provider = getExecutablesProviderForProject(project); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
102 |
if (provider != null) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
103 |
trace("Getting executables for project: " + project.getName() + " using " + provider.toString()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
104 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
105 |
// store the list of executables for this project |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
106 |
synchronized (executablesMap) { |
135
6f8730b7758d
Fix for Bug 10689, binaries disappearing when added to the Executables view.
stechong
parents:
72
diff
changeset
|
107 |
List<Executable> executables = provider.getExecutables(project, subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE)); |
137 | 108 |
if (!subMonitor.isCanceled()) { |
135
6f8730b7758d
Fix for Bug 10689, binaries disappearing when added to the Executables view.
stechong
parents:
72
diff
changeset
|
109 |
executablesMap.put(project, executables); |
6f8730b7758d
Fix for Bug 10689, binaries disappearing when added to the Executables view.
stechong
parents:
72
diff
changeset
|
110 |
} |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
111 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
112 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
113 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
114 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
115 |
// notify the listeners |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
116 |
synchronized (changeListeners) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
117 |
for (IExecutablesChangeListener listener : changeListeners) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
118 |
listener.executablesListChanged(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
119 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
120 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
121 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
122 |
trace("Get Executables job finished at " + getStringFromTimestamp(System.currentTimeMillis())); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
123 |
|
37 | 124 |
return Status.OK_STATUS; |
125 |
} |
|
126 |
}; |
|
127 |
||
128 |
private static ExecutablesManager executablesManager = null; |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
129 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
130 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
131 |
* Get the executables manager instance |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
132 |
* @return the executables manager |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
133 |
*/ |
37 | 134 |
public static ExecutablesManager getExecutablesManager() { |
135 |
if (executablesManager == null) |
|
136 |
executablesManager = new ExecutablesManager(); |
|
137 |
return executablesManager; |
|
138 |
} |
|
139 |
||
140 |
public ExecutablesManager() { |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
141 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
142 |
// check if debugging is enabled |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
143 |
BundleContext context = CDebugCorePlugin.getDefault().getBundle().getBundleContext(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
144 |
if (context != null) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
145 |
ServiceReference reference = CDebugCorePlugin.getDefault().getBundle().getBundleContext().getServiceReference(DebugOptions.class.getName()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
146 |
if (reference != null) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
147 |
DebugOptions service = (DebugOptions) context.getService(reference); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
148 |
if (service != null) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
149 |
try { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
150 |
DEBUG = service.getBooleanOption(EXECUTABLES_MANAGER_DEBUG_TRACING, false); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
151 |
} finally { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
152 |
// we have what we want - release the service |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
153 |
context.ungetService(reference); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
154 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
155 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
156 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
157 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
158 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
159 |
refreshJob.setPriority(Job.SHORT); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
160 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
161 |
// load the extension points |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
162 |
loadExecutableProviderExtensions(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
163 |
loadSoureFileProviderExtensions(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
164 |
loadSoureRemappingExtensions(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
165 |
loadExecutableImporterExtensions(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
166 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
167 |
// add the standard providers |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
168 |
executableProviders.add(0, new StandardExecutableProvider()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
169 |
sourceFileProviders.add(0, new StandardSourceFilesProvider()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
170 |
sourceFileRemappings.add(0, new StandardSourceFileRemapping()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
171 |
executableImporters.add(0, new StandardExecutableImporter()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
172 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
173 |
// listen for events we're interested in |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
174 |
ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.POST_BUILD); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
175 |
CoreModel.getDefault().getProjectDescriptionManager().addCProjectDescriptionListener(this, |
72
451134ee4e6e
fixed bug #9644. also fixed build hammer tooltip which had the same underlying cause.
wpaul
parents:
60
diff
changeset
|
176 |
CProjectDescriptionEvent.APPLIED); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
177 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
178 |
// schedule a refresh so we get up to date |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
179 |
scheduleRefresh(); |
37 | 180 |
} |
181 |
||
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
182 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
183 |
* Adds an executable listener |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
184 |
* @param listener the listener to add |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
185 |
*/ |
37 | 186 |
public void addExecutablesChangeListener(IExecutablesChangeListener listener) { |
187 |
changeListeners.add(listener); |
|
188 |
} |
|
189 |
||
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
190 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
191 |
* Removes an executable listener |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
192 |
* @param listener the listener to remove |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
193 |
*/ |
37 | 194 |
public void removeExecutablesChangeListener(IExecutablesChangeListener listener) { |
195 |
changeListeners.remove(listener); |
|
196 |
} |
|
197 |
||
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
198 |
/** |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
199 |
* Gets the list of executables in the workspace. |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
200 |
* @param wait whether or not to wait if the list is being refreshed when this |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
201 |
* method is called. when true, this call will not return until the list is |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
202 |
* complete. when false, it will return with the last known list. if calling |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
203 |
* from any UI, you should not block the UI waiting for this to return, but rather |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
204 |
* register as an {@link IExecutablesChangeListener} to get notifications when the |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
205 |
* list changes. |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
206 |
* @return the list of executables which may be empty |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
207 |
*/ |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
208 |
public Collection<Executable> getExecutables(boolean wait) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
209 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
210 |
trace("getExecutables called at " + getStringFromTimestamp(System.currentTimeMillis())); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
211 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
212 |
List<Executable> executables = new ArrayList<Executable>(); |
51
49c226a8748e
CDT 6.0 from cdt_6_0 branch (eclipse.org cvs repository). This overwrites previous CDT 6.0 merges.
timkelly
parents:
45
diff
changeset
|
213 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
214 |
if (wait && refreshJob.getState() != Job.NONE) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
215 |
trace("waiting for refresh job to finish at " + getStringFromTimestamp(System.currentTimeMillis())); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
216 |
try { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
217 |
refreshJob.join(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
218 |
} catch (InterruptedException e) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
219 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
220 |
trace("refresh job finished at " + getStringFromTimestamp(System.currentTimeMillis())); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
221 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
222 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
223 |
synchronized (executablesMap) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
224 |
for (List<Executable> exes : executablesMap.values()) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
225 |
for (Executable exe : exes) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
226 |
if (!executables.contains(exe)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
227 |
executables.add(exe); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
228 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
229 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
230 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
231 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
232 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
233 |
trace("getExecutables returned at " + getStringFromTimestamp(System.currentTimeMillis())); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
234 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
235 |
return executables; |
51
49c226a8748e
CDT 6.0 from cdt_6_0 branch (eclipse.org cvs repository). This overwrites previous CDT 6.0 merges.
timkelly
parents:
45
diff
changeset
|
236 |
} |
37 | 237 |
|
238 |
/** |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
239 |
* Gets the list of executables in the workspace. Equivalent to {@link ExecutablesManager}{@link #getExecutables(false)}. |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
240 |
* Just kept for older API compatibility. |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
241 |
* @return the list of executables which may be empty |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
242 |
*/ |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
243 |
public Collection<Executable> getExecutables() { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
244 |
return getExecutables(false); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
245 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
246 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
247 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
248 |
* @since 6.0 |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
249 |
* Gets the collection of executables for the given project |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
250 |
* @param project the project |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
251 |
* @return collection of executables which may be empty |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
252 |
*/ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
253 |
public Collection<Executable> getExecutablesForProject(IProject project) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
254 |
List<Executable> executables = new ArrayList<Executable>(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
255 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
256 |
synchronized (executablesMap) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
257 |
List<Executable> exes = executablesMap.get(project); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
258 |
if (exes != null) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
259 |
for (Executable exe : exes) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
260 |
if (!executables.contains(exe)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
261 |
executables.add(exe); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
262 |
} |
37 | 263 |
} |
264 |
} |
|
265 |
} |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
266 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
267 |
return executables; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
268 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
269 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
270 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
271 |
* Attempt to remap the path to the given source file in the given executable using |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
272 |
* source file mapping extensions |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
273 |
* @param executable the executable |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
274 |
* @param filePath the absolute path to the source file |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
275 |
* @return the new path to the source file, which was remapped if possible |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
276 |
* |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
277 |
* @since 6.0 |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
278 |
*/ |
37 | 279 |
public String remapSourceFile(Executable executable, String filePath) { |
280 |
synchronized (sourceFileRemappings) { |
|
281 |
for (ISourceFileRemapping remapping : sourceFileRemappings) { |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
282 |
String remappedPath = remapping.remapSourceFile(executable.getPath(), filePath); |
37 | 283 |
if (!remappedPath.equals(filePath)) |
284 |
return remappedPath; |
|
285 |
} |
|
286 |
} |
|
287 |
return filePath; |
|
288 |
} |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
289 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
290 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
291 |
* Import the given executables into the manager |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
292 |
* @param fileNames the absolute paths of the executables to import |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
293 |
* @param monitor progress monitor |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
294 |
*/ |
51
49c226a8748e
CDT 6.0 from cdt_6_0 branch (eclipse.org cvs repository). This overwrites previous CDT 6.0 merges.
timkelly
parents:
45
diff
changeset
|
295 |
public void importExecutables(final String[] fileNames, IProgressMonitor monitor) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
296 |
|
37 | 297 |
boolean handled = false; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
298 |
monitor.beginTask("Import Executables", executableImporters.size()); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
299 |
synchronized (executableImporters) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
300 |
Collections.sort(executableImporters, new Comparator<IExecutableImporter>() { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
301 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
302 |
public int compare(IExecutableImporter arg0, IExecutableImporter arg1) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
303 |
int p0 = arg0.getPriority(fileNames); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
304 |
int p1 = arg1.getPriority(fileNames); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
305 |
if (p0 < p1) |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
306 |
return 1; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
307 |
if (p0 > p1) |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
308 |
return -1; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
309 |
return 0; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
310 |
}}); |
37 | 311 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
312 |
for (IExecutableImporter importer : executableImporters) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
313 |
handled = importer.importExecutables(fileNames, new SubProgressMonitor(monitor, 1)); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
314 |
if (handled || monitor.isCanceled()) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
315 |
break; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
316 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
317 |
} |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
318 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
319 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
320 |
if (handled) |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
321 |
scheduleRefresh(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
322 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
323 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
324 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
325 |
* Determines if the given executable is currently known by the manager |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
326 |
* @param exePath the absolute path to the executable |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
327 |
* @return true if the manager knows about it, false otherwise |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
328 |
*/ |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
329 |
public boolean executableExists(IPath exePath) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
330 |
synchronized (executablesMap) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
331 |
for (List<Executable> exes : executablesMap.values()) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
332 |
for (Executable exe : exes) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
333 |
if (exe.getPath().equals(exePath)) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
334 |
return true; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
335 |
} |
37 | 336 |
} |
337 |
} |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
338 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
339 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
340 |
return false; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
341 |
} |
37 | 342 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
343 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
344 |
* Get the list of source files for the given executable |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
345 |
* @param executable the executable |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
346 |
* @param monitor progress monitor |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
347 |
* @return an array of source files which may be empty |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
348 |
*/ |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
349 |
public String[] getSourceFiles(final Executable executable, IProgressMonitor monitor) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
350 |
String[] result = new String[0]; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
351 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
352 |
trace("getSourceFiles called at " + getStringFromTimestamp(System.currentTimeMillis()) + " for " + executable.getPath().toOSString()); |
37 | 353 |
|
354 |
synchronized (sourceFileProviders) { |
|
355 |
Collections.sort(sourceFileProviders, new Comparator<ISourceFilesProvider>() { |
|
356 |
||
357 |
public int compare(ISourceFilesProvider arg0, ISourceFilesProvider arg1) { |
|
358 |
int p0 = arg0.getPriority(executable); |
|
359 |
int p1 = arg1.getPriority(executable); |
|
360 |
if (p0 < p1) |
|
361 |
return 1; |
|
362 |
if (p0 > p1) |
|
363 |
return -1; |
|
364 |
return 0; |
|
365 |
}}); |
|
366 |
||
367 |
monitor.beginTask("Finding source files in " + executable.getName(), sourceFileProviders.size()); |
|
368 |
for (ISourceFilesProvider provider : sourceFileProviders) { |
|
369 |
String[] sourceFiles = provider.getSourceFiles(executable, new SubProgressMonitor(monitor, 1)); |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
370 |
if (sourceFiles.length > 0) { |
37 | 371 |
result = sourceFiles; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
372 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
373 |
trace("getSourceFiles got " + sourceFiles.length + " files from " + provider.toString()); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
374 |
|
37 | 375 |
break; |
376 |
} |
|
377 |
} |
|
378 |
monitor.done(); |
|
379 |
} |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
380 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
381 |
trace("getSourceFiles returned at " + getStringFromTimestamp(System.currentTimeMillis())); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
382 |
|
51
49c226a8748e
CDT 6.0 from cdt_6_0 branch (eclipse.org cvs repository). This overwrites previous CDT 6.0 merges.
timkelly
parents:
45
diff
changeset
|
383 |
return result; |
37 | 384 |
} |
385 |
||
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
386 |
/** |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
387 |
* Removes the given executables |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
388 |
* @param executables the array of executables to be removed |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
389 |
* @param monitor progress monitor |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
390 |
* @return IStatus of the operation |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
391 |
* |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
392 |
* @since 6.0 |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
393 |
*/ |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
394 |
public IStatus removeExecutables(Executable[] executables, IProgressMonitor monitor) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
395 |
MultiStatus status = new MultiStatus(CDebugCorePlugin.PLUGIN_ID, IStatus.WARNING, "Couldn't remove all of the selected executables", null); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
396 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
397 |
monitor.beginTask("Remove Executables", executables.length); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
398 |
for (Executable executable : executables) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
399 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
400 |
IProjectExecutablesProvider provider = getExecutablesProviderForProject(executable.getProject()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
401 |
if (provider != null) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
402 |
IStatus result = provider.removeExecutable(executable, new SubProgressMonitor(monitor, 1)); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
403 |
if (result.isOK()) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
404 |
// remove the exe from the list |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
405 |
List<Executable> exes = executablesMap.get(executable.getProject()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
406 |
if (exes != null) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
407 |
exes.remove(executable); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
408 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
409 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
410 |
status.add(result); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
411 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
412 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
413 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
414 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
415 |
// notify listeners that the list has changed. only do this if at least one delete succeeded. |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
416 |
if (status.getChildren().length != executables.length) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
417 |
synchronized (changeListeners) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
418 |
for (IExecutablesChangeListener listener : changeListeners) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
419 |
listener.executablesListChanged(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
420 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
421 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
422 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
423 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
424 |
return status; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
425 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
426 |
|
37 | 427 |
/** |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
428 |
* Refresh the list of executables for the given projects |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
429 |
* @param projects the list of projects, or null. if null or the list |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
430 |
* is empty, all projects will be refreshed. |
51
49c226a8748e
CDT 6.0 from cdt_6_0 branch (eclipse.org cvs repository). This overwrites previous CDT 6.0 merges.
timkelly
parents:
45
diff
changeset
|
431 |
*/ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
432 |
public void refresh(List<IProject> projects) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
433 |
if (projects == null || projects.size() == 0) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
434 |
// clear the entire cache |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
435 |
executablesMap.clear(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
436 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
437 |
for (IProject project : projects) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
438 |
executablesMap.remove(project); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
439 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
440 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
441 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
442 |
scheduleRefresh(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
443 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
444 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
445 |
public void resourceChanged(IResourceChangeEvent event) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
446 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
447 |
synchronized (executablesMap) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
448 |
// project needs to be refreshed after a build/clean as the binary may |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
449 |
// be added/removed/renamed etc. |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
450 |
if (event.getType() == IResourceChangeEvent.POST_BUILD) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
451 |
Object obj = event.getSource(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
452 |
if (obj != null && obj instanceof IProject) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
453 |
try { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
454 |
// make sure there's at least one builder for the project. this gets called even |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
455 |
// when there are no builder (e.g. the Executables project for imported executables). |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
456 |
IProject project = (IProject)obj; |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
457 |
if (project.getDescription().getBuildSpec().length > 0) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
458 |
if (executablesMap.containsKey(obj)) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
459 |
List<Executable> executables = executablesMap.remove(obj); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
460 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
461 |
trace("Scheduling refresh because project " + ((IProject)obj).getName() + " built or cleaned"); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
462 |
|
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
463 |
scheduleRefresh(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
464 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
465 |
// notify the listeners that these executables have possibly changed |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
466 |
if (executables != null && executables.size() > 0) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
467 |
synchronized (changeListeners) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
468 |
for (IExecutablesChangeListener listener : changeListeners) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
469 |
listener.executablesChanged(executables); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
470 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
471 |
} |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
472 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
473 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
474 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
475 |
} catch (CoreException e) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
476 |
e.printStackTrace(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
477 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
478 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
479 |
return; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
480 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
481 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
482 |
// refresh when projects are opened or closed. note that deleted |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
483 |
// projects are handled later in this method. new projects are handled |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
484 |
// in handleEvent. resource changed events always start at the workspace |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
485 |
// root, so projects are the next level down |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
486 |
boolean refreshNeeded = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
487 |
IResourceDelta[] projects = event.getDelta().getAffectedChildren(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
488 |
for (IResourceDelta projectDelta : projects) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
489 |
if ((projectDelta.getFlags() & IResourceDelta.OPEN) != 0) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
490 |
if (projectDelta.getKind() == IResourceDelta.CHANGED) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
491 |
// project was opened or closed |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
492 |
if (executablesMap.containsKey(projectDelta.getResource())) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
493 |
executablesMap.remove(projectDelta.getResource()); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
494 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
495 |
refreshNeeded = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
496 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
497 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
498 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
499 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
500 |
if (refreshNeeded) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
501 |
trace("Scheduling refresh because project(s) opened or closed"); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
502 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
503 |
scheduleRefresh(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
504 |
return; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
505 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
506 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
507 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
508 |
event.getDelta().accept(new IResourceDeltaVisitor() { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
509 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
510 |
public boolean visit(IResourceDelta delta) throws CoreException { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
511 |
if (delta.getKind() == IResourceDelta.ADDED || delta.getKind() == IResourceDelta.REMOVED) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
512 |
IResource deltaResource = delta.getResource(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
513 |
if (deltaResource != null) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
514 |
boolean refresh = false; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
515 |
if (delta.getKind() == IResourceDelta.REMOVED && deltaResource instanceof IProject) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
516 |
// project deleted |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
517 |
if (executablesMap.containsKey(deltaResource)) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
518 |
executablesMap.remove(deltaResource); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
519 |
refresh = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
520 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
521 |
trace("Scheduling refresh because project " + deltaResource.getName() + " deleted"); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
522 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
523 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
524 |
// see if a binary has been added/removed |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
525 |
IPath resourcePath = deltaResource.getLocation(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
526 |
if (resourcePath != null && Executable.isExecutableFile(resourcePath)) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
527 |
if (executablesMap.containsKey(deltaResource.getProject())) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
528 |
executablesMap.remove(deltaResource.getProject()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
529 |
refresh = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
530 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
531 |
trace("Scheduling refresh because a binary was added/removed"); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
532 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
533 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
534 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
535 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
536 |
if (refresh) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
537 |
scheduleRefresh(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
538 |
return false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
539 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
540 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
541 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
542 |
return true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
543 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
544 |
}); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
545 |
} catch (CoreException e) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
546 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
547 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
548 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
549 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
550 |
public void handleEvent(CProjectDescriptionEvent event) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
551 |
// this handles the cases where the active build configuration changes, |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
552 |
// and when new projects are created or loaded at startup. |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
553 |
boolean refresh = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
554 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
555 |
int eventType = event.getEventType(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
556 |
|
72
451134ee4e6e
fixed bug #9644. also fixed build hammer tooltip which had the same underlying cause.
wpaul
parents:
60
diff
changeset
|
557 |
if (eventType == CProjectDescriptionEvent.APPLIED) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
558 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
559 |
synchronized (executablesMap) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
560 |
// see if the active build config has changed |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
561 |
ICProjectDescription newDesc = event.getNewCProjectDescription(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
562 |
ICProjectDescription oldDesc = event.getOldCProjectDescription(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
563 |
if (oldDesc != null && newDesc != null) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
564 |
String newConfigName = newDesc.getActiveConfiguration().getName(); |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
565 |
String oldConfigName = oldDesc.getActiveConfiguration().getName(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
566 |
if (!newConfigName.equals(oldConfigName)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
567 |
if (executablesMap.containsKey(newDesc.getProject())) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
568 |
executablesMap.remove(newDesc.getProject()); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
569 |
refresh = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
570 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
571 |
trace("Scheduling refresh because active build configuration changed"); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
572 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
573 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
574 |
} else if (newDesc != null && oldDesc == null) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
575 |
// project just created |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
576 |
refresh = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
577 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
578 |
trace("Scheduling refresh because project " + newDesc.getProject().getName() + " created"); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
579 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
580 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
581 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
582 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
583 |
if (refresh) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
584 |
scheduleRefresh(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
585 |
} |
37 | 586 |
} |
587 |
||
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
588 |
private List<IProject> getProjectsToCheck() { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
589 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
590 |
List<IProject> projects = new ArrayList<IProject>(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
591 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
592 |
synchronized (executablesMap) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
593 |
// look for any CDT projects not in our cache |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
594 |
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
595 |
if (!executablesMap.containsKey(project)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
596 |
if (CoreModel.hasCNature(project)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
597 |
projects.add(project); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
598 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
599 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
600 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
601 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
602 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
603 |
return projects; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
604 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
605 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
606 |
private void scheduleRefresh() { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
607 |
trace("scheduleRefresh called at " + getStringFromTimestamp(System.currentTimeMillis())); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
608 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
609 |
refreshJob.cancel(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
610 |
refreshJob.schedule(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
611 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
612 |
|
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
613 |
private IProjectExecutablesProvider getExecutablesProviderForProject(IProject project) { |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
614 |
IProjectExecutablesProvider provider = executablesProviderMap.get(project); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
615 |
if (provider == null) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
616 |
// not cached yet. get the list of project natures from the providers and |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
617 |
// pick the one with the closest match |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
618 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
619 |
IProjectDescription description = project.getDescription(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
620 |
int mostNaturesMatched = 0; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
621 |
for (IProjectExecutablesProvider exeProvider : executableProviders) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
622 |
List<String> natures = exeProvider.getProjectNatures(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
623 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
624 |
int naturesMatched = 0; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
625 |
for (String nature : description.getNatureIds()) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
626 |
if (natures.contains(nature)) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
627 |
naturesMatched++; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
628 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
629 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
630 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
631 |
if (naturesMatched > mostNaturesMatched) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
632 |
provider = exeProvider; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
633 |
mostNaturesMatched = naturesMatched; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
634 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
635 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
636 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
637 |
// cache it |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
638 |
executablesProviderMap.put(project, provider); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
639 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
640 |
} catch (CoreException e) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
641 |
e.printStackTrace(); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
642 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
643 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
644 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
645 |
return provider; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
646 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
647 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
648 |
private void loadExecutableProviderExtensions() { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
649 |
executableProviders = Collections.synchronizedList(new ArrayList<IProjectExecutablesProvider>()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
650 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
651 |
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
652 |
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesProvider"); //$NON-NLS-1$ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
653 |
IExtension[] extensions = extensionPoint.getExtensions(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
654 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
655 |
for (int i = 0; i < extensions.length; i++) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
656 |
IExtension extension = extensions[i]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
657 |
IConfigurationElement[] elements = extension.getConfigurationElements(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
658 |
IConfigurationElement element = elements[0]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
659 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
660 |
boolean failed = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
661 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
662 |
Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
663 |
if (extObject instanceof IProjectExecutablesProvider) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
664 |
executableProviders.add((IProjectExecutablesProvider)extObject); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
665 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
666 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
667 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
668 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
669 |
catch (CoreException e) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
670 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
671 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
672 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
673 |
if (failed) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
674 |
CDebugCorePlugin.log("Unable to load ExecutablesProvider extension from " + extension.getContributor().getName()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
675 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
676 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
677 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
678 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
679 |
private void loadSoureFileProviderExtensions() { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
680 |
sourceFileProviders = Collections.synchronizedList(new ArrayList<ISourceFilesProvider>()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
681 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
682 |
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
683 |
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceFilesProvider"); //$NON-NLS-1$ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
684 |
IExtension[] extensions = extensionPoint.getExtensions(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
685 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
686 |
for (int i = 0; i < extensions.length; i++) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
687 |
IExtension extension = extensions[i]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
688 |
IConfigurationElement[] elements = extension.getConfigurationElements(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
689 |
IConfigurationElement element = elements[0]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
690 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
691 |
boolean failed = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
692 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
693 |
Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
694 |
if (extObject instanceof ISourceFilesProvider) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
695 |
sourceFileProviders.add((ISourceFilesProvider)extObject); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
696 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
697 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
698 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
699 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
700 |
catch (CoreException e) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
701 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
702 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
703 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
704 |
if (failed) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
705 |
CDebugCorePlugin.log("Unable to load SourceFilesProvider extension from " + extension.getContributor().getName()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
706 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
707 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
708 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
709 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
710 |
private void loadSoureRemappingExtensions() { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
711 |
sourceFileRemappings = Collections.synchronizedList(new ArrayList<ISourceFileRemapping>()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
712 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
713 |
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
714 |
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceRemappingProvider"); //$NON-NLS-1$ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
715 |
IExtension[] extensions = extensionPoint.getExtensions(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
716 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
717 |
for (int i = 0; i < extensions.length; i++) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
718 |
IExtension extension = extensions[i]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
719 |
IConfigurationElement[] elements = extension.getConfigurationElements(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
720 |
IConfigurationElement element = elements[0]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
721 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
722 |
boolean failed = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
723 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
724 |
Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
725 |
if (extObject instanceof ISourceFileRemapping) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
726 |
sourceFileRemappings.add((ISourceFileRemapping)extObject); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
727 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
728 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
729 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
730 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
731 |
catch (CoreException e) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
732 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
733 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
734 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
735 |
if (failed) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
736 |
CDebugCorePlugin.log("Unable to load SourceRemappingProvider extension from " + extension.getContributor().getName()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
737 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
738 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
739 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
740 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
741 |
private void loadExecutableImporterExtensions() { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
742 |
executableImporters = Collections.synchronizedList(new ArrayList<IExecutableImporter>()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
743 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
744 |
IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
745 |
IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesImporter"); //$NON-NLS-1$ |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
746 |
IExtension[] extensions = extensionPoint.getExtensions(); |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
747 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
748 |
for (int i = 0; i < extensions.length; i++) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
749 |
IExtension extension = extensions[i]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
750 |
IConfigurationElement[] elements = extension.getConfigurationElements(); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
751 |
IConfigurationElement element = elements[0]; |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
752 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
753 |
boolean failed = false; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
754 |
try { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
755 |
Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
756 |
if (extObject instanceof IExecutableImporter) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
757 |
executableImporters.add((IExecutableImporter)extObject); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
758 |
} else { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
759 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
760 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
761 |
} |
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
762 |
catch (CoreException e) { |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
763 |
failed = true; |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
764 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
765 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
766 |
if (failed) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
767 |
CDebugCorePlugin.log("Unable to load ExecutablesImporter extension from " + extension.getContributor().getName()); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
768 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
769 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
770 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
771 |
|
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
772 |
private void trace(String msg) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
773 |
if (DEBUG) { |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
774 |
// TODO use Logger? |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
775 |
System.out.println(msg); |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
776 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
777 |
} |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
778 |
|
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
779 |
private String getStringFromTimestamp(long timestamp) { |
60
3982fab6369e
fixed executables view merge problems - bug #'s 9562, 9568, 9571.
wpaul
parents:
52
diff
changeset
|
780 |
return DateFormat.getTimeInstance(DateFormat.MEDIUM).format(new Date(timestamp)); |
52
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
781 |
} |
42077b7eab6e
Second merge to proper cdt_6_0 branch for CDT bugs 181020, 279844, & Carbide bugs 6152 & 9031.
timkelly
parents:
51
diff
changeset
|
782 |
} |