summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Liu2011-07-21 13:32:17 (EDT)
committer Vivian Kong2011-07-21 13:32:17 (EDT)
commitb04b352ac384a8aab6f1d96ded6b0eedd6e22330 (patch)
treee0c929c3e0dc5c9772e946cfc87433c078897f7f
parent525d976ae7aed53c563bb9ed664a63f468b6d80f (diff)
downloadorg.eclipse.cdt-b04b352ac384a8aab6f1d96ded6b0eedd6e22330.zip
org.eclipse.cdt-b04b352ac384a8aab6f1d96ded6b0eedd6e22330.tar.gz
org.eclipse.cdt-b04b352ac384a8aab6f1d96ded6b0eedd6e22330.tar.bz2
Bug 352758 - Update some private fields in some scanner parsers to
protected
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java8
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java4
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java8
-rw-r--r--xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java10
4 files changed, 15 insertions, 15 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java
index 9080be7..d296098 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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
@@ -29,7 +29,7 @@ import org.eclipse.core.resources.IProject;
* @author vhirsl
*/
public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsoleParser {
- private static final String[] COMPILER_INVOCATION = {
+ protected static final String[] COMPILER_INVOCATION = {
"gcc", "g++", "cc", "c++" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
};
protected static final String DASHIDASH= "-I-"; //$NON-NLS-1$
@@ -37,12 +37,12 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole
protected static final String DASHD= "-D"; //$NON-NLS-1$
private IProject project;
- private IScannerInfoCollector collector;
+ protected IScannerInfoCollector collector;
private boolean bMultiline = false;
private String sMultiline = ""; //$NON-NLS-1$
- private String[] fCompilerCommands;
+ protected String[] fCompilerCommands;
/**
* @return Returns the project.
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java
index 2cef94c..496b912 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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
@@ -35,7 +35,7 @@ import org.eclipse.core.runtime.Path;
*/
public class GCCScannerInfoConsoleParser extends AbstractGCCBOPConsoleParser {
- private ScannerInfoConsoleParserUtility fUtil = null;
+ protected ScannerInfoConsoleParserUtility fUtil = null;
private String fDefaultMacroDefinitionValue= "1"; //$NON-NLS-1$
/* (non-Javadoc)
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
index 1c0e1b1..16e1d2f 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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
@@ -38,11 +38,11 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
private final String DEFINE = "#define"; //$NON-NLS-1$
private IProject fProject = null;
- private IScannerInfoCollector fCollector = null;
+ protected IScannerInfoCollector fCollector = null;
private boolean expectingIncludes = false;
- private List<String> symbols = new ArrayList<String>();
- private List<String> includes = new ArrayList<String>();
+ protected List<String> symbols = new ArrayList<String>();
+ protected List<String> includes = new ArrayList<String>();
/* (non-Javadoc)
* @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
index 1cc7711..d4fbeb0 100644
--- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
+++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsConsoleParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 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
@@ -48,7 +48,7 @@ public class XlCSpecsConsoleParser implements IScannerInfoConsoleParser {
.compile("-(?:qgcc_c_stdinc|qc_stdinc|qgcc_cpp_stdinc|qcpp_stdinc)=(.*)"); //$NON-NLS-1$
// xlC compiler constants
- final static String [] compilerConstants = {
+ protected final static String [] compilerConstants = {
"__IBMCPP__", //$NON-NLS-1$
"__xlC__", //$NON-NLS-1$
"__IBMC__", //$NON-NLS-1$
@@ -57,11 +57,11 @@ public class XlCSpecsConsoleParser implements IScannerInfoConsoleParser {
private IProject fProject = null;
- private IScannerInfoCollector fCollector = null;
+ protected IScannerInfoCollector fCollector = null;
- private List<String> symbols = new ArrayList<String>();
+ protected List<String> symbols = new ArrayList<String>();
- private List<String> includes = new ArrayList<String>();
+ protected List<String> includes = new ArrayList<String>();
/*
* (non-Javadoc)