Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-06-04 14:26:09 -0400
committereutarass2010-06-04 14:26:09 -0400
commit4a10daa6b4f6020d163f7a1ce35b5c6f2c0110d6 (patch)
treedac66151779f0e36135becaf0587b2335fe879eb
parent8217215f8715949a124995632605640710f8a4e6 (diff)
parent67df2c6efdf04eebb801e0ba176d083044017daf (diff)
downloadorg.eclipse.tcf-0.3.0.tar.gz
org.eclipse.tcf-0.3.0.tar.xz
org.eclipse.tcf-0.3.0.zip
Moving tag 0.3.0 to latest version0.3.0
-rw-r--r--examples/org.eclipse.tm.tcf.examples.daytime/plugin.properties2
-rw-r--r--features/org.eclipse.tm.tcf.feature/feature.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.core/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java3
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPane.java3
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java3
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestRCBP1.java2
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf.rse/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.tm.tcf/plugin.properties2
-rw-r--r--plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfAbstractExtensionPointManager.java20
-rw-r--r--plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfExtensionPointComparator.java9
21 files changed, 45 insertions, 47 deletions
diff --git a/examples/org.eclipse.tm.tcf.examples.daytime/plugin.properties b/examples/org.eclipse.tm.tcf.examples.daytime/plugin.properties
index 9e576a77b..eceb8e311 100644
--- a/examples/org.eclipse.tm.tcf.examples.daytime/plugin.properties
+++ b/examples/org.eclipse.tm.tcf.examples.daytime/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF Daytime service example (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/features/org.eclipse.tm.tcf.feature/feature.properties b/features/org.eclipse.tm.tcf.feature/feature.properties
index d54af04cf..5ba0c7f07 100644
--- a/features/org.eclipse.tm.tcf.feature/feature.properties
+++ b/features/org.eclipse.tm.tcf.feature/feature.properties
@@ -13,7 +13,7 @@
featureName=Target Communication Framework
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse.org - DSDP
# "updateSiteName" property - label for the update site
updateSiteName=TCF Update Site
diff --git a/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
index e10e727c2..9e7046604 100644
--- a/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
@@ -9,4 +9,4 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/CDT Integration UI (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf.core/plugin.properties b/plugins/org.eclipse.tm.tcf.core/plugin.properties
index ac2e7fdbe..9a08fa149 100644
--- a/plugins/org.eclipse.tm.tcf.core/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.core/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = Target Communication Framework (TCF) Core (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java
index 0d2bcf540..dc92ea236 100644
--- a/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java
+++ b/plugins/org.eclipse.tm.tcf.core/src/org/eclipse/tm/internal/tcf/services/remote/RunControlProxy.java
@@ -196,7 +196,7 @@ public class RunControlProxy implements IRunControl {
listener.containerSuspended(
(String)args[0],
args[1] == null ? null : ((Number)args[1]).toString(),
- (String)args[2], (Map)args[3],
+ (String)args[2], (Map<String,Object>)args[3],
toStringArray(args[4]));
}
else if (name.equals("containerResumed")) {
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
index e1e059356..0affb61aa 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
@@ -9,7 +9,7 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/Eclipse Debugger Integration UI (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
debugCurrentInstructionPointer = Debug Current Instruction Pointer
debugCallStack = Debug Call Stack
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
index e7e4e350b..5a111a953 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/TCFPathMapTab.java
@@ -209,9 +209,8 @@ public class TCFPathMapTab extends AbstractLaunchConfigurationTab {
button_remove.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
button_remove.addSelectionListener(new SelectionAdapter() {
@Override
- @SuppressWarnings("unchecked")
public void widgetSelected(SelectionEvent e) {
- for (Iterator i = ((IStructuredSelection)viewer.getSelection()).iterator(); i.hasNext();) {
+ for (Iterator<?> i = ((IStructuredSelection)viewer.getSelection()).iterator(); i.hasNext();) {
PathMapRule a = (PathMapRule)i.next();
map.remove(a);
viewer.remove(a);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPane.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPane.java
index 793209c97..6361cc8ff 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPane.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFDetailPane.java
@@ -54,14 +54,13 @@ public class TCFDetailPane implements IDetailPane {
return control;
}
- @SuppressWarnings("unchecked")
public void display(IStructuredSelection selection) {
if (source_viewer == null) return;
generation++;
final int g = generation;
final ArrayList<TCFNode> nodes = new ArrayList<TCFNode>();
if (selection != null) {
- Iterator iterator = selection.iterator();
+ Iterator<?> iterator = selection.iterator();
while (iterator.hasNext()) {
Object next = iterator.next();
if (next instanceof TCFNode) nodes.add((TCFNode)next);
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
index f869294a4..678723985 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
@@ -150,8 +150,7 @@ public class TCFNodeExecContext extends TCFNode implements ISymbolOwner {
children_exec = new TCFChildrenExecContext(this);
children_stack = new TCFChildrenStackTrace(this);
line_info_cache = new LinkedHashMap<BigInteger,TCFSourceRef>() {
- @SuppressWarnings("unchecked")
- protected boolean removeEldestEntry(Map.Entry eldest) {
+ protected boolean removeEldestEntry(Map.Entry<BigInteger,TCFSourceRef> eldest) {
return size() > 256;
}
};
diff --git a/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
index e9fa92d8f..8ff00cef8 100644
--- a/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf.debug/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Import-Package: org.eclipse.tm.tcf.core;version="0.3.0",
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
-Export-Package: org.eclipse.tm.internal.tcf.debug.launch,
- org.eclipse.tm.internal.tcf.debug.actions,
- org.eclipse.tm.internal.tcf.debug.tests,
- org.eclipse.tm.internal.tcf.debug.model
+Export-Package: org.eclipse.tm.internal.tcf.debug.launch;x-friends:="org.eclipse.tm.tcf.debug.ui,org.eclipse.tm.tcf.cdt.ui",
+ org.eclipse.tm.internal.tcf.debug.actions;x-friends:="org.eclipse.tm.tcf.debug.ui",
+ org.eclipse.tm.internal.tcf.debug.tests;x-friends:="org.eclipse.tm.tcf.debug.ui",
+ org.eclipse.tm.internal.tcf.debug.model;x-friends:="org.eclipse.tm.tcf.debug.ui"
diff --git a/plugins/org.eclipse.tm.tcf.debug/plugin.properties b/plugins/org.eclipse.tm.tcf.debug/plugin.properties
index 2ee5bcc61..c76ad3ebf 100644
--- a/plugins/org.eclipse.tm.tcf.debug/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.debug/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/Eclipse Debugger Integration Core (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestRCBP1.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestRCBP1.java
index 10b7fd7a4..ea6d0f89b 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestRCBP1.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestRCBP1.java
@@ -315,7 +315,7 @@ class TestRCBP1 implements ITCFTest, IRunControl.RunControlListener {
assert !bp_set_done;
Map<String,Object> m[] = new Map[7];
for (int i = 0; i < m.length; i++) {
- m[i] = new HashMap();
+ m[i] = new HashMap<String,Object>();
m[i].put(IBreakpoints.PROP_ID, "TcfTestBP" + i + "" + channel_id);
m[i].put(IBreakpoints.PROP_ENABLED, Boolean.TRUE);
switch (i) {
diff --git a/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
index 66fa253e8..120a936ed 100644
--- a/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf.dsf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.tcf.dsf.ui;singleton:=true
-Bundle-Version: 0.3.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.tm.internal.tcf.dsf.ui.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
@@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.tm.tcf.debug,
org.eclipse.tm.tcf.debug.ui,
org.eclipse.tm.tcf.dsf
-Import-Package: org.eclipse.tm.tcf.core;version="0.3.0",
- org.eclipse.tm.tcf.protocol;version="0.3.0",
- org.eclipse.tm.tcf.services;version="0.3.0",
- org.eclipse.tm.tcf.util;version="0.3.0",
+Import-Package: org.eclipse.tm.tcf.core;version="0.2.0",
+ org.eclipse.tm.tcf.protocol;version="0.2.0",
+ org.eclipse.tm.tcf.services;version="0.2.0",
+ org.eclipse.tm.tcf.util;version="0.2.0",
org.eclipse.cdt.debug.core.model
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties
index 8ccb4cf24..bec289046 100644
--- a/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.dsf.ui/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/DSF Integration UI (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF
index a62a323da..a2a72fbbb 100644
--- a/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf.dsf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.tcf.dsf;singleton:=true
-Bundle-Version: 0.3.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.tm.internal.tcf.dsf.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.dd.dsf.debug,
org.eclipse.cdt.core,
org.eclipse.tm.tcf.debug
-Import-Package: org.eclipse.tm.tcf.core;version="0.3.0",
- org.eclipse.tm.tcf.protocol;version="0.3.0",
- org.eclipse.tm.tcf.services;version="0.3.0",
- org.eclipse.tm.tcf.util;version="0.3.0"
+Import-Package: org.eclipse.tm.tcf.core;version="0.2.0",
+ org.eclipse.tm.tcf.protocol;version="0.2.0",
+ org.eclipse.tm.tcf.services;version="0.2.0",
+ org.eclipse.tm.tcf.util;version="0.2.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tm.tcf.dsf/plugin.properties b/plugins/org.eclipse.tm.tcf.dsf/plugin.properties
index 9d3271be5..a55ebff6c 100644
--- a/plugins/org.eclipse.tm.tcf.dsf/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.dsf/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/DSF Integration Core (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf.rse/plugin.properties b/plugins/org.eclipse.tm.tcf.rse/plugin.properties
index 08449789e..0acc36874 100644
--- a/plugins/org.eclipse.tm.tcf.rse/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.rse/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = TCF/RSE Integration
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF
index be08e576e..f2c20e86b 100644
--- a/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.tcf/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.eclipse.core.runtime
Bundle-Activator: org.eclipse.tm.tcf.Activator
Import-Package: org.eclipse.tm.tcf.core;version="0.3.0",
org.eclipse.tm.tcf.protocol;version="0.3.0"
-Export-Package: org.eclipse.tm.tcf.extensions,
+Export-Package: org.eclipse.tm.tcf.extensions;version="0.3.0",
org.eclipse.tm.tcf.ssl;version="0.3.0"
diff --git a/plugins/org.eclipse.tm.tcf/plugin.properties b/plugins/org.eclipse.tm.tcf/plugin.properties
index e6adf3ac0..3cedc1b2a 100644
--- a/plugins/org.eclipse.tm.tcf/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf/plugin.properties
@@ -9,5 +9,5 @@
# Wind River Systems - initial implementation
###############################################################################
pluginName = Target Communication Framework (TCF) (Incubation)
-providerName = Eclipse.org
+providerName = Eclipse.org - DSDP
diff --git a/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfAbstractExtensionPointManager.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfAbstractExtensionPointManager.java
index 4973190fd..75cf854d4 100644
--- a/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfAbstractExtensionPointManager.java
+++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfAbstractExtensionPointManager.java
@@ -50,7 +50,7 @@ public abstract class TcfAbstractExtensionPointManager<V> {
/**
* Returns if or if not the service provider extension point manager
* got initialized. Initialized means that the manager read the
- * contributitions for the managed extension point.
+ * contributions for the managed extension point.
*
* @return <code>True</code> if already initialized, <code>false</code> otherwise.
*/
@@ -61,7 +61,7 @@ public abstract class TcfAbstractExtensionPointManager<V> {
/**
* Sets if or if not the service provider extension point manager
* is initialized. Initialized means that the manager has read
- * the contributitions for the managed extension point.
+ * the contributions for the managed extension point.
*
* @return <code>True</code> to set the extension point manager is initialized, <code>false</code> otherwise.
*/
@@ -74,11 +74,11 @@ public abstract class TcfAbstractExtensionPointManager<V> {
* this methods trigger the loading of the extensions to the managed
* extension point.
*
- * @return The map of contributables.
+ * @return The map of contributions.
*/
protected Map<String, TcfExtensionProxy<V>> getExtensions() {
- if (!isInitialized()) { loadExtensions(); setInitialized(true); }
- return fExtensions;
+ if (!isInitialized()) { loadExtensions(); setInitialized(true); }
+ return fExtensions;
}
/**
@@ -143,7 +143,7 @@ public abstract class TcfAbstractExtensionPointManager<V> {
* @param element The configuration element of the extension. Must be not <code>null</code>.
* @return The extension proxy instance.
*
- * @throws CoreException If the extension proxy instanciation failed.
+ * @throws CoreException If the extension proxy instantiation failed.
*/
protected TcfExtensionProxy<V> doCreateExtensionProxy(IConfigurationElement element) throws CoreException {
assert element != null;
@@ -168,7 +168,7 @@ public abstract class TcfAbstractExtensionPointManager<V> {
try {
TcfExtensionProxy<V> candidate = doCreateExtensionProxy(element);
if (candidate.getId() != null) {
- // If no contributable with this id had been registered before, register now.
+ // If no contribution with this id had been registered before, register now.
if (!fExtensions.containsKey(candidate.getId())) {
fExtensions.put(candidate.getId(), candidate);
}
@@ -179,14 +179,16 @@ public abstract class TcfAbstractExtensionPointManager<V> {
NLS.bind(TcfPluginMessages.Extension_error_duplicateExtension, candidate.getId(), element.getContributor().getName()),
null));
}
- } else {
+ }
+ else {
throw new CoreException(new Status(IStatus.ERROR,
Activator.PLUGIN_ID,
0,
NLS.bind(TcfPluginMessages.Extension_error_missingRequiredAttribute, "id", element.getAttribute("label")), //$NON-NLS-1$ //$NON-NLS-2$
null));
}
- } catch (CoreException e) {
+ }
+ catch (CoreException e) {
IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
NLS.bind(TcfPluginMessages.Extension_error_invalidExtensionPoint, element.getDeclaringExtension().getUniqueIdentifier()),
e);
diff --git a/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfExtensionPointComparator.java b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfExtensionPointComparator.java
index ab6b24aaf..a6b71ecd0 100644
--- a/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfExtensionPointComparator.java
+++ b/plugins/org.eclipse.tm.tcf/src/org/eclipse/tm/tcf/extensions/TcfExtensionPointComparator.java
@@ -33,7 +33,7 @@ public class TcfExtensionPointComparator implements Comparator<IExtension> {
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
public int compare(IExtension o1, IExtension o2) {
- // We ignore any comparisation with null and
+ // We ignore any comparison with null and
if (o1 == null || o2 == null) return 0;
// Check if it is the exact same element
if (o1 == o2) return 0;
@@ -49,10 +49,10 @@ public class TcfExtensionPointComparator implements Comparator<IExtension> {
return 1;
if (contributor1.startsWith(TCF_PLUGIN_PATTERN) && contributor2.startsWith(TCF_PLUGIN_PATTERN)) {
int value = contributor1.compareTo(contributor2);
- // Within the same plugins, the extension are sorted by thier unique id (if available)
+ // Within the same plugins, the extension are sorted by their unique id (if available)
if (value == 0 && o1.getUniqueIdentifier() != null && o2.getUniqueIdentifier() != null)
return o1.getUniqueIdentifier().compareTo(o2.getUniqueIdentifier());
- // Otherwise, just return the comparisation result from the contributors
+ // Otherwise, just return the comparison result from the contributors
return value;
}
@@ -61,8 +61,7 @@ public class TcfExtensionPointComparator implements Comparator<IExtension> {
// Within the same plugins, the extension are sorted by thier unique id (if available)
if (value == 0 && o1.getUniqueIdentifier() != null && o2.getUniqueIdentifier() != null)
return o1.getUniqueIdentifier().compareTo(o2.getUniqueIdentifier());
- // Otherwise, just return the comparisation result from the contributors
+ // Otherwise, just return the comparison result from the contributors
return value;
}
-
}

Back to the top