mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-21 07:55:24 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-19 18:59:43 -07:00
parent d193756141
commit c4b91212b3
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorParserExtensionManager.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2009, 2011 Andrew Gvozdev (Quoin Inc.) and others. * Copyright (c) 2009, 2012 Andrew Gvozdev (Quoin Inc.) and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,8 +7,8 @@
* *
* Contributors: * Contributors:
* Andrew Gvozdev (Quoin Inc.) - initial API and implementation * Andrew Gvozdev (Quoin Inc.) - initial API and implementation
* Alex Ruiz (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.errorparsers; package org.eclipse.cdt.internal.errorparsers;
import static org.eclipse.cdt.core.ErrorParserContext.BUILD; import static org.eclipse.cdt.core.ErrorParserContext.BUILD;
@ -52,8 +52,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
/** /**
* ErrorParserExtensionManager manages error parser extensions, serialization and preferences * ErrorParserExtensionManager manages error parser extensions, serialization and preferences.
*
*/ */
public class ErrorParserExtensionManager { public class ErrorParserExtensionManager {
private static final String STORAGE_ERRORPARSER_EXTENSIONS = "model.extensions.xml"; //$NON-NLS-1$ private static final String STORAGE_ERRORPARSER_EXTENSIONS = "model.extensions.xml"; //$NON-NLS-1$
@ -396,7 +395,7 @@ public class ErrorParserExtensionManager {
IErrorParser errorParser = errorParserNamed; IErrorParser errorParser = errorParserNamed;
if (errorParser instanceof ErrorParserNamedWrapper) if (errorParser instanceof ErrorParserNamedWrapper)
errorParser = ((ErrorParserNamedWrapper)errorParser).getErrorParser(); errorParser = ((ErrorParserNamedWrapper) errorParser).getErrorParser();
// <extension/> // <extension/>
Element elementExtension = XmlUtil.appendElement(elementPlugin, ELEM_EXTENSION, new String[] { Element elementExtension = XmlUtil.appendElement(elementPlugin, ELEM_EXTENSION, new String[] {
@ -413,7 +412,7 @@ public class ErrorParserExtensionManager {
}); });
if (errorParserNamed instanceof RegexErrorParser) { if (errorParserNamed instanceof RegexErrorParser) {
RegexErrorParser regexErrorParser = (RegexErrorParser)errorParserNamed; RegexErrorParser regexErrorParser = (RegexErrorParser) errorParserNamed;
RegexErrorPattern[] patterns = regexErrorParser.getPatterns(); RegexErrorPattern[] patterns = regexErrorParser.getPatterns();
for (RegexErrorPattern pattern : patterns) { for (RegexErrorPattern pattern : patterns) {
@ -521,7 +520,7 @@ public class ErrorParserExtensionManager {
if (ce.getAttribute(ATTR_CLASS)!=null) { if (ce.getAttribute(ATTR_CLASS)!=null) {
IErrorParser ep = (IErrorParser)ce.createExecutableExtension(ATTR_CLASS); IErrorParser ep = (IErrorParser)ce.createExecutableExtension(ATTR_CLASS);
if (ep instanceof IErrorParserNamed) { if (ep instanceof IErrorParserNamed) {
errorParser = (IErrorParserNamed)ep; errorParser = (IErrorParserNamed) ep;
errorParser.setId(initialId); errorParser.setId(initialId);
errorParser.setName(initialName); errorParser.setName(initialName);
} else if (ep!=null) { } else if (ep!=null) {
@ -546,7 +545,7 @@ public class ErrorParserExtensionManager {
errorParser.setId(id); errorParser.setId(id);
errorParser.setName(name); errorParser.setName(name);
if (errorParser instanceof RegexErrorParser) { if (errorParser instanceof RegexErrorParser) {
RegexErrorParser regexErrorParser = (RegexErrorParser)errorParser; RegexErrorParser regexErrorParser = (RegexErrorParser) errorParser;
NodeList patternNodes = errorparserNode.getChildNodes(); NodeList patternNodes = errorparserNode.getChildNodes();
for (int ipat=0;ipat<patternNodes.getLength();ipat++) { for (int ipat=0;ipat<patternNodes.getLength();ipat++) {
@ -587,7 +586,7 @@ public class ErrorParserExtensionManager {
errorParser.setName(name); errorParser.setName(name);
if (errorParser instanceof RegexErrorParser) { if (errorParser instanceof RegexErrorParser) {
RegexErrorParser regexErrorParser = (RegexErrorParser)errorParser; RegexErrorParser regexErrorParser = (RegexErrorParser) errorParser;
for (IConfigurationElement cepat : cfgEl.getChildren()) { for (IConfigurationElement cepat : cfgEl.getChildren()) {
if (cepat.getName().equals(ELEM_PATTERN)) { if (cepat.getName().equals(ELEM_PATTERN)) {
@ -643,7 +642,7 @@ public class ErrorParserExtensionManager {
Pair<IErrorParserNamed, Integer> pair = fAvailableErrorParsers.get(id); Pair<IErrorParserNamed, Integer> pair = fAvailableErrorParsers.get(id);
IErrorParserNamed errorParser = pair.first; IErrorParserNamed errorParser = pair.first;
if (errorParser instanceof ErrorParserNamedWrapper) if (errorParser instanceof ErrorParserNamedWrapper)
return ((ErrorParserNamedWrapper)errorParser).getErrorParser(); return ((ErrorParserNamedWrapper) errorParser).getErrorParser();
return errorParser; return errorParser;
} }
@ -783,9 +782,9 @@ public class ErrorParserExtensionManager {
IErrorParserNamed errorParser = pair.first; IErrorParserNamed errorParser = pair.first;
try { try {
if (errorParser instanceof RegexErrorParser) { if (errorParser instanceof RegexErrorParser) {
return (RegexErrorParser) ((RegexErrorParser)errorParser).clone(); return (RegexErrorParser) ((RegexErrorParser) errorParser).clone();
} else if (errorParser instanceof ErrorParserNamedWrapper) { } else if (errorParser instanceof ErrorParserNamedWrapper) {
return (ErrorParserNamedWrapper) ((ErrorParserNamedWrapper)errorParser).clone(); return (ErrorParserNamedWrapper) ((ErrorParserNamedWrapper) errorParser).clone();
} }
} catch (CloneNotSupportedException e) { } catch (CloneNotSupportedException e) {
CCorePlugin.log(e); CCorePlugin.log(e);