diff options
author | cvs2svn | 2007-05-14 18:42:24 +0000 |
---|---|---|
committer | cvs2svn | 2007-05-14 18:42:24 +0000 |
commit | 1c94c4b6d048a03bdc0d28d7eefbfbc27462f9c1 (patch) | |
tree | 15fd0c299f4fd753d84d71a82eccb5b07094bca6 /xlc/org.eclipse.cdt.errorparsers.xlc | |
parent | 3349dac957e75956710a2df64c89e27af5a9f64a (diff) | |
download | org.eclipse.cdt-200705211931.tar.gz org.eclipse.cdt-200705211931.tar.xz org.eclipse.cdt-200705211931.zip |
This commit was manufactured by cvs2svn to create tag 'v200705141931'.v200705211931v200705141931
Sprout from cdt_3_1 2007-05-14 18:42:23 UTC Chris Recoskie <recoskie@ca.ibm.com> 'fixes for 186787 and 186789, from Jason Montojo'
Delete:
xlc/org.eclipse.cdt.errorparsers.xlc/.classpath
xlc/org.eclipse.cdt.errorparsers.xlc/.project
xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF
xlc/org.eclipse.cdt.errorparsers.xlc/about.html
xlc/org.eclipse.cdt.errorparsers.xlc/build.properties
xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties
xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml
xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java
xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/XlcErrorParser.java
xlc/org.eclipse.cdt.xlc.feature/.project
xlc/org.eclipse.cdt.xlc.feature/eclipse_update_120.jpg
xlc/org.eclipse.cdt.xlc.feature/epl-v10.html
xlc/org.eclipse.cdt.xlc.feature/feature.properties
xlc/org.eclipse.cdt.xlc.feature/license.html
Diffstat (limited to 'xlc/org.eclipse.cdt.errorparsers.xlc')
9 files changed, 0 insertions, 392 deletions
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/.classpath b/xlc/org.eclipse.cdt.errorparsers.xlc/.classpath deleted file mode 100644 index 7398f97e2d0..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry path="src" kind="src"/> - <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/> - <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/> - <classpathentry path="bin" kind="output"/> -</classpath> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/.project b/xlc/org.eclipse.cdt.errorparsers.xlc/.project deleted file mode 100644 index 510561ddc19..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.cdt.errorparsers.xlc</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF deleted file mode 100644 index 58573da0eb5..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.cdt.errorparsers.xlc; singleton:=true -Bundle-Version: 1.0.0 -Bundle-Activator: org.eclipse.cdt.errorparsers.xlc.Activator -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.cdt.core, - org.eclipse.core.resources -Eclipse-LazyStart: true -Export-Package: org.eclipse.cdt.errorparsers.xlc -Bundle-Vendor: %providerName diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/about.html b/xlc/org.eclipse.cdt.errorparsers.xlc/about.html deleted file mode 100644 index f8a1ce18403..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/about.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head> - -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>July 24, 2006</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> - -</body></html>
\ No newline at end of file diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/build.properties b/xlc/org.eclipse.cdt.errorparsers.xlc/build.properties deleted file mode 100644 index f7540fbc534..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.properties,\ - plugin.xml,\ - about.html diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties deleted file mode 100644 index 9df0aa7752e..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation 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: -# IBM Corporation - initial API and implementation -############################################################################### -# plugin.properties -# contains externalized strings for plugin.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. -pluginName=xlC Error Parser Plugin -providerName=Eclipse.org - -CDTXLCErrorParser.name=CDT xlC Error Parser
\ No newline at end of file diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml deleted file mode 100644 index 42da3e3d9f2..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.xml +++ /dev/null @@ -1,7 +0,0 @@ -<plugin> -<extension id="XlcErrorParser" - name="%CDTXLCErrorParser.name" - point="org.eclipse.cdt.core.ErrorParser"> - <errorparser class="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser" /> -</extension> -</plugin> diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java deleted file mode 100644 index f7da1236975..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.errorparsers.xlc; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.cdt.errorparsers.xlc"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/XlcErrorParser.java b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/XlcErrorParser.java deleted file mode 100644 index 49eaa0f2731..00000000000 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/XlcErrorParser.java +++ /dev/null @@ -1,225 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - - - -package org.eclipse.cdt.errorparsers.xlc; - -import java.util.StringTokenizer; -import org.eclipse.cdt.core.ErrorParserManager; -import org.eclipse.cdt.core.IErrorParser; -import org.eclipse.cdt.core.IMarkerGenerator; -import org.eclipse.core.resources.IFile; - -/** - * This class provides methods for parsing the error messages - * generated by xlc compiler. - * @author ravisankar - * - */ -public class XlcErrorParser implements IErrorParser -{ - private String fileName; - private int lineNumber; - private String severity; - private String message; - private int severityNum; - public XlcErrorParser() - { - fileName = null; - lineNumber = -1; - severity = null; - message = null; - severityNum = -1; - } - /** - * This function returns the file name extracted from - * the error message. - * @return The string value of the given file name. - */ - public String getFileName() - { - return fileName; - } - /** - * This function returns the line number of - * the error. - * @return The integer value of the line number. - */ - public int getLineNumber() - { - return lineNumber; - } - /** - * This function returns the severity of the - * error that has occured. - * @return The string value of the severity. - */ - public String getSeverity() - { - return severity; - } - /** - * This function returns the descriptive string of the - * error that has occured. - * @return The string value of the message. - */ - public String getMessage() - { - return message; - } - /** - * This function parses the error message occured and fills the - * class variables fileName, lineNumber, message, severity. - * @param line is the error message generated by the xlC compiler. - * @return a boolean value indicating the success/failure of - * extracting the values for fileName, lineNumber, message, severity. - */ - public boolean parseLine(String line) - { - String lineNum = null; - String secondPart = null; - StringTokenizer tok = null; - int firstComma = line.indexOf(','); //$NON-NLS-1$ - // Check for the first occurance of comma. - if( firstComma != -1 ) - { - String firstPart = line.substring(0,firstComma); - /* Check for double-quotes before the first occurance - of comma. */ - tok = new StringTokenizer(firstPart,"\""); //$NON-NLS-1$ - if(tok.hasMoreTokens()) - { - fileName = tok.nextToken(); - } - else - { - /* If the file name doesnot exist return - false. */ - return false; - } - secondPart = line.substring(firstComma + 1); - /* look for '.' character after the first occurance - of comma. */ - tok = new StringTokenizer(secondPart,"."); //$NON-NLS-1$ - if(tok.hasMoreTokens()) - { - String token = tok.nextToken(); - /* look for the string "line " before the - the occurance of '.' operator. */ - int index; - if( (index = token.indexOf("line ")) != -1) //$NON-NLS-1$ - { - /* The string that begins after "line " and ends - before '.' operator is the line number. */ - lineNum = token.substring(index + 5); - lineNumber = Integer.parseInt(lineNum); - } - else - { - return false; - } - } - int index = -1; - /* look for the first occurance of ")" after the - * first occurance of comma. - */ - index = secondPart.indexOf(")"); //$NON-NLS-1$ - if( -1 == index ) - { - return false; - } - /* The character that resides before the ")" operator - * indicates the severity of the message. The part of the - * error message that follows ")" is the description of the - * error. - */ - message = secondPart.substring(index + 1); - severity = secondPart.substring(index - 1, index); - if( severity.equals("I") ) //$NON-NLS-1$ - { - severityNum = IMarkerGenerator.SEVERITY_INFO; - } - else if( severity.equals("W") ) //$NON-NLS-1$ - { - severityNum = IMarkerGenerator.SEVERITY_WARNING; - } - else if( severity.equals("E") || severity.equals("S") ) //$NON-NLS-1$ //$NON-NLS-2$ - { - severityNum = IMarkerGenerator.SEVERITY_ERROR_RESOURCE; - } - else if( severity.equals("U") ) //$NON-NLS-1$ - { - severityNum = IMarkerGenerator.SEVERITY_ERROR_BUILD; - } - else - { - return false; - } - } - else - { - return false; - } - return true; - } - /** - * This function processes the error message and passed the information - * to the ErrorParserManager. - * @param line is the error message generated by the xlc compiler - * and eoParser is the ErrorParserManager object. - * @return a boolean value indicating the success/failure of - * extracing values from the error message. - */ - public boolean processLine(String line, ErrorParserManager eoParser) - { - try - { - if( parseLine(line) ) - { - IFile file = null; - if (fileName != null) - { - file = eoParser.findFileName(fileName); - if (file != null) - { - /* Check if there are conflicting file - * names. - */ - if (eoParser.isConflictingName(fileName)) - { - file = null; - } - } - else - { - // Find the path of the file. - file = eoParser.findFilePath(fileName); - } - if (file == null) - { - message = fileName + " " + message; //$NON-NLS-1$ - } - } - eoParser.generateMarker(file, lineNumber, message, severityNum, null); - return true; - } - else - { - return false; - } - } - catch(NumberFormatException e ) - { - throw e; - } - } -}
\ No newline at end of file |