summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Ruiz2012-04-27 02:35:55 (EDT)
committer Sergey Prigogin2012-04-27 13:49:30 (EDT)
commit247c492036de5306c747d630774388aa2e073316 (patch)
tree78b7bdb9e5a452109ba2b20263d4450920b6afd0
parentb6a384b943d12fbf7fccdb6142fcfed7de8d8a01 (diff)
downloadorg.eclipse.cdt-247c492036de5306c747d630774388aa2e073316.zip
org.eclipse.cdt-247c492036de5306c747d630774388aa2e073316.tar.gz
org.eclipse.cdt-247c492036de5306c747d630774388aa2e073316.tar.bz2
Removed Pair class. Replaced getErrorParserAvailableIds()
with getErrorParserAvailableIdsInContext(String) where appropriate. IErrorParser3 extends IErrorParser directly. Change-Id: Ie0ccd4835a797a4911275cb28410f2b26236976c Reviewed-on: https://git.eclipse.org/r/5683 Reviewed-by: Andrew Gvozdev <angvoz.dev@gmail.com> IP-Clean: Andrew Gvozdev <angvoz.dev@gmail.com> Tested-by: Andrew Gvozdev <angvoz.dev@gmail.com> Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com> IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com> Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java2
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java2
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java2
-rw-r--r--core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java35
5 files changed, 4 insertions, 39 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index 1065640..8a55afc 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -1427,7 +1427,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
set.toArray(result);
return result;
}
- return ErrorParserManager.getErrorParserAvailableIds();
+ return ErrorParserManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
}
public Set<String> contributeErrorParsers(Set<String> set, boolean includeChildren) {
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
index 2e03f2b..1f080d6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
@@ -483,7 +483,7 @@ public class Target extends BuildObject implements ITarget {
} else {
// If no error parsers are specified by the target, the default is
// all error parsers
- errorParsers = ErrorParserManager.getErrorParserAvailableIds();
+ errorParsers = ErrorParserManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
}
return errorParsers;
}
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
index 2357f2e..0a0e0e3 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
@@ -1000,7 +1000,7 @@ public class CCorePlugin extends Plugin {
@Deprecated
public String[] getAllErrorParsersIDs() {
ErrorParserExtensionManager.loadErrorParserExtensions();
- return ErrorParserExtensionManager.getErrorParserAvailableIds();
+ return ErrorParserExtensionManager.getErrorParserAvailableIdsInContext(ErrorParserManager.BUILD_CONTEXT);
}
/**
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
index 92c2ac2..9fcadee 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IErrorParser3.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.core;
/**
* @since 5.4
*/
-public interface IErrorParser3 extends IErrorParser2 {
+public interface IErrorParser3 extends IErrorParser {
/**
* Called to let the parser know that the end of the error stream has been reached.
* Can be used by the parser to flush its internal buffers.
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java
deleted file mode 100644
index 3be11ee..0000000
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/Pair.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Google, Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Ruiz (Google) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.core;
-
-/**
- * A pair of values.
- */
-public class Pair<F, S> {
- public final F first;
- public final S second;
-
- public Pair(F first, S second) {
- this.first = first;
- this.second = second;
- }
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("<"); //$NON-NLS-1$
- builder.append(first);
- builder.append(">, <"); //$NON-NLS-1$
- builder.append(second);
- builder.append(">"); //$NON-NLS-1$
- return builder.toString();
- }
-}