mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

Bug 540373: Cleanup: Format & Remove trailing whitespace

Browse source 
This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Format source code
- Remove trailing white spaces on all lines
and completing the wizard

Change-Id: I63685372c6bcc67719bcf145123bcb72e5b00394
This commit is contained in:
Jonah Graham 2018-11-20 16:20:42 +00:00
parent 35996a5c5c
commit 170e654b47
7984 changed files with 448190 additions and 465755 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
View file

@ -39,7 +39,7 @@ import org.eclipse.core.runtime.jobs.Job;
public class AutotoolsNewProjectNature implements IProjectNature {
public static final String AUTOTOOLS_NATURE_ID = "org.eclipse.cdt.autotools.core.autotoolsNatureV2"; //$NON-NLS-1$
public static final String AUTOTOOLS_NATURE_ID = "org.eclipse.cdt.autotools.core.autotoolsNatureV2"; //$NON-NLS-1$
public static final String OLD_AUTOTOOLS_NATURE_ID = "org.eclipse.linuxtools.cdt.autotools.core.autotoolsNatureV2"; //$NON-NLS-1$
public static final String BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".genmakebuilder"; //$NON-NLS-1$
/**
@ -49,7 +49,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
public static final String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
private IProject project;
@Override
public void configure() throws CoreException {
addAutotoolsBuilder(project, new NullProgressMonitor());
@ -59,17 +59,17 @@ public class AutotoolsNewProjectNature implements IProjectNature {
public void deconfigure() throws CoreException {
// TODO remove builder from here
}
@Override
public IProject getProject() {
return project;
}
@Override
public void setProject(IProject project) {
this.project = project;
}
/**
* Add the Autotools builder to the project
* @param project
@ -80,7 +80,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
// Add the builder to the project
IProjectDescription description = project.getDescription();
ICommand[] commands = description.getBuildSpec();
if(checkEquals(commands,getBuildCommandsList(description, commands))){
if (checkEquals(commands, getBuildCommandsList(description, commands))) {
return;
}
final ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot();
@ -101,21 +101,21 @@ public class AutotoolsNewProjectNature implements IProjectNature {
//Other pieces of wizard might have contributed new builder commands;
//need to make sure we are using the most recent ones
ICommand[] currentCommands = prDescription.getBuildSpec();
ICommand[] newCommands = getBuildCommandsList(prDescription, currentCommands);
if(!checkEquals(currentCommands,newCommands)){
ICommand[] newCommands = getBuildCommandsList(prDescription, currentCommands);
if (!checkEquals(currentCommands, newCommands)) {
prDescription.setBuildSpec(newCommands);
proj.setDescription(prDescription, new NullProgressMonitor());
}
restoreAutoBuild(workspace);
}
protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException {
IWorkspaceDescription workspaceDesc = workspace.getDescription();
savedAutoBuildingValue = workspaceDesc.isAutoBuilding();
workspaceDesc.setAutoBuilding(false);
workspace.setDescription(workspaceDesc);
}
protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException {
IWorkspaceDescription workspaceDesc = workspace.getDescription();
workspaceDesc.setAutoBuilding(savedAutoBuildingValue);
@ -134,21 +134,19 @@ public class AutotoolsNewProjectNature implements IProjectNature {
backgroundJob.schedule();
}
static boolean checkEquals(ICommand[] commands,
ICommand[] newCommands) {
if (newCommands.length != commands.length){
static boolean checkEquals(ICommand[] commands, ICommand[] newCommands) {
if (newCommands.length != commands.length) {
return false;
}
for (int j = 0; j < commands.length; ++j) {
if (!commands[j].getBuilderName().equals(newCommands[j].getBuilderName())) {
return false;
}
for (int j = 0; j < commands.length; ++j) {
if (!commands[j].getBuilderName().equals(newCommands[j].getBuilderName())) {
return false;
}
}
return true;
}
return true;
}
static ICommand[] getBuildCommandsList(IProjectDescription description,
ICommand[] commands) {
static ICommand[] getBuildCommandsList(IProjectDescription description, ICommand[] commands) {
ArrayList<ICommand> commandList = new ArrayList<>();
// Make sure the Autotools Configuration builder just precedes the Common Builder
@ -164,8 +162,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
}
// Make sure that the Autotools builder precedes the Managed builder
// or the Remote Synchronized builder.
if (command.getBuilderName().equals(BUILDER_ID) ||
command.getBuilderName().equals(REMOTE_BUILDER_ID)) {
if (command.getBuilderName().equals(BUILDER_ID) || command.getBuilderName().equals(REMOTE_BUILDER_ID)) {
// add Autotools Configuration builder just before builder
ICommand newCommand = description.newCommand();
newCommand.setBuilderName(AutotoolsConfigurationBuilder.BUILDER_ID);
@ -179,7 +176,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
/**
* Utility method for adding an autotools nature to a project.
*
*
* @param proj the project to add the autotools nature to.
* @param monitor a progress monitor to indicate the duration of the operation, or
* <code>null</code> if progress reporting is not required.
@ -190,7 +187,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
/**
* Utility method for adding a nature to a project.
*
*
* @param proj the project to add the nature to.
* @param natureId the id of the nature to assign to the project
* @param monitor a progress monitor to indicate the duration of the operation, or
@ -209,13 +206,13 @@ public class AutotoolsNewProjectNature implements IProjectNature {
description.setNatureIds(newNatures);
project.setDescription(description, monitor);
}
/**
* Utility method to remove the autotools nature from a project.
*
*
* @param project to remove the autotools nature from
* @param mon progress monitor to indicate the duration of the operation, or
* <code>null</code> if progress reporting is not required.
* @param mon progress monitor to indicate the duration of the operation, or
* <code>null</code> if progress reporting is not required.
* @throws CoreException
*/
public static void removeAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
@ -224,10 +221,10 @@ public class AutotoolsNewProjectNature implements IProjectNature {
/**
* Utility method to remove the old autotools nature from a project.
*
*
* @param project to remove the old autotools nature from
* @param mon progress monitor to indicate the duration of the operation, or
* <code>null</code> if progress reporting is not required.
* @param mon progress monitor to indicate the duration of the operation, or
* <code>null</code> if progress reporting is not required.
* @throws CoreException
*/
public static void removeOldAutotoolsNature(IProject project, IProgressMonitor mon) throws CoreException {
@ -236,7 +233,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
/**
* Utility method for removing a project nature from a project.
*
*
* @param proj the project to remove the nature from
* @param natureId the nature id to remove
* @param monitor a progress monitor to indicate the duration of the operation, or

23
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsPlugin.java
View file

@ -44,7 +44,7 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
//The shared instance.
private static AutotoolsPlugin plugin;
private ResourceBundle resourceBundle;
public static final String PLUGIN_ID = "org.eclipse.cdt.autotools.core"; //$NON-NLS-1$
public static final String AUTOTOOLS_PROJECT_TYPE_ID = "org.eclipse.linuxtools.cdt.autotools.core.projectType"; //$NON-NLS-1$
@ -65,7 +65,7 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
public static String getPluginId() {
return PLUGIN_ID;
}
public static String getUniqueIdentifier() {
if (getDefault() == null) {
// If the default instance is not yet initialized,
@ -94,7 +94,7 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
/**
* Return the OSGi service with the given service interface.
*
*
* @param service service interface
* @return the specified service or null if it's not registered
* @since 1.5
@ -108,7 +108,7 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
/**
* Returns the string from the plugin's resource bundle,
* or 'key' if not found.
*
*
* @param key the message key
* @return the resource bundle message
*/
@ -124,13 +124,13 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
/**
* Returns the string from the plugin's resource bundle,
* or 'key' if not found.
*
*
* @param key the message key
* @param args an array of substituition strings
* @return the resource bundle message
*/
public static String getFormattedString(String key, String[] args) {
return MessageFormat.format(getResourceString(key), (Object[])args);
return MessageFormat.format(getResourceString(key), (Object[]) args);
}
/**
@ -187,15 +187,14 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
/**
* Return set of Autotool configuration options for a given build configuration id.
*
*
* @param project existing autotools project
* @param cfgId configuration id
* @return a copy of Autotools configurations for the given configuration id
* @throws CoreException if project is not valid Autotools project or cfgId does not exist
* @since 1.2
*/
public Map<String, IAutotoolsOption> getAutotoolCfgOptions(IProject project,
String cfgId) throws CoreException {
public Map<String, IAutotoolsOption> getAutotoolCfgOptions(IProject project, String cfgId) throws CoreException {
return AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(project, cfgId);
}
@ -206,11 +205,11 @@ public class AutotoolsPlugin extends AbstractUIPlugin {
* @param cfgId configuation id
* @param options set of updated Autotool configuration options
* @throws CoreException if project is not valid Autotools project or cfgId does not exist
*
*
* @since 1.2
*/
public void updateAutotoolCfgOptions(IProject project, String cfgId,
Map<String,IAutotoolsOption> options) throws CoreException {
public void updateAutotoolCfgOptions(IProject project, String cfgId, Map<String, IAutotoolsOption> options)
throws CoreException {
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(project, cfgId, options);
}

1
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/IAutotoolsOption.java
View file

@ -12,7 +12,6 @@ package org.eclipse.cdt.autotools.core;
import org.eclipse.core.runtime.CoreException;
/**
* @since 1.2
*/

51
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java
View file

@ -43,24 +43,23 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
public static final String BUILDER_ID = AutotoolsPlugin.getPluginId() + "." + BUILDER_NAME; //$NON-NLS-1$
public static final String OLD_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.core.genmakebuilderV2"; //$NON-NLS-1$
private static final String BUILD_STOPPED="AutotoolsMakefileBuilder.message.stopped"; //$NON-NLS-1$
private static final String BUILD_STOPPED = "AutotoolsMakefileBuilder.message.stopped"; //$NON-NLS-1$
private AutotoolsNewMakeGenerator generator;
public AutotoolsConfigurationBuilder() {
super();
generator = new AutotoolsNewMakeGenerator();
}
protected boolean isCdtProjectCreated(IProject project){
protected boolean isCdtProjectCreated(IProject project) {
ICProjectDescription des = CoreModel.getDefault().getProjectDescription(project, false);
return des != null && !des.isCdtProjectCreating();
}
@Override
protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor monitor)
throws CoreException {
protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor monitor) throws CoreException {
IProject project = getProject();
if(!isCdtProjectCreated(project))
if (!isCdtProjectCreated(project))
return project.getReferencedProjects();
boolean bPerformBuild = true;
@ -110,7 +109,7 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
checkCancel(monitor);
return getProject().getReferencedProjects();
}
@Override
protected void clean(IProgressMonitor monitor) {
IProject project = getProject();
@ -118,15 +117,17 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
if (shouldBuild(CLEAN_BUILD, info)) {
IConfiguration icfg = info.getDefaultConfiguration();
if (icfg instanceof IMultiConfiguration) {
IMultiConfiguration mcfg = (IMultiConfiguration)icfg;
IConfiguration[] cfgs = (IConfiguration[])mcfg.getItems();
IMultiConfiguration mcfg = (IMultiConfiguration) icfg;
IConfiguration[] cfgs = (IConfiguration[]) mcfg.getItems();
for (int i = 0; i < cfgs.length; ++i) {
IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project,
icfg.getName());
cfg.setDirty(true);
}
} else {
IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, icfg.getName());
cfg.setDirty(true); // Mark Configuration dirty so next build will do full reconfigure
IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project,
icfg.getName());
cfg.setDirty(true); // Mark Configuration dirty so next build will do full reconfigure
}
}
}
@ -134,16 +135,15 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
protected MultiStatus performMakefileGeneration(IProject project, IManagedBuildInfo info,
IProgressMonitor monitor) {
MultiStatus result;
try {
generator.initialize(project, info, monitor);
result = generator.regenerateMakefiles(false);
} catch (CoreException e) {
String errMsg = AutotoolsPlugin.getResourceString("MakeGenerator.didnt.generate"); //$NON-NLS-1$
result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR,
errMsg, e);
result = new MultiStatus(AutotoolsPlugin.getUniqueIdentifier(), IStatus.ERROR, errMsg, e);
}
return result;
}
@ -160,18 +160,17 @@ public class AutotoolsConfigurationBuilder extends ACBuilder {
IBuilder builder = null;
if (cfg != null) {
builder = cfg.getEditableBuilder();
switch (kind) {
case IncrementalProjectBuilder.AUTO_BUILD :
return builder.isAutoBuildEnable();
case IncrementalProjectBuilder.INCREMENTAL_BUILD : // now treated as the same!
case IncrementalProjectBuilder.FULL_BUILD :
return builder.isFullBuildEnabled() | builder.isIncrementalBuildEnabled() ;
case IncrementalProjectBuilder.CLEAN_BUILD :
return builder.isCleanBuildEnabled();
}
switch (kind) {
case IncrementalProjectBuilder.AUTO_BUILD:
return builder.isAutoBuildEnable();
case IncrementalProjectBuilder.INCREMENTAL_BUILD: // now treated as the same!
case IncrementalProjectBuilder.FULL_BUILD:
return builder.isFullBuildEnabled() | builder.isIncrementalBuildEnabled();
case IncrementalProjectBuilder.CLEAN_BUILD:
return builder.isCleanBuildEnabled();
}
}
return true;
}
}

6
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsEnvironmentVariableSupplier.java
View file

@ -41,12 +41,14 @@ public class AutotoolsEnvironmentVariableSupplier implements IConfigurationEnvir
private static boolean isVar(String name) {
// Windows has case insensitive env var names
return Platform.getOS().equals(Platform.OS_WIN32) ? name.equalsIgnoreCase(VerboseEnvironmentVariable.VERBOSE_VAR_NAME)
return Platform.getOS().equals(Platform.OS_WIN32)
? name.equalsIgnoreCase(VerboseEnvironmentVariable.VERBOSE_VAR_NAME)
: name.equals(VerboseEnvironmentVariable.VERBOSE_VAR_NAME);
}
private static IBuildEnvironmentVariable create() {
return new VerboseEnvironmentVariable(VERBOSE_VAR_NAME, VERBOSE_VAR_VALUE, IEnvironmentVariable.ENVVAR_PREPEND, null);
return new VerboseEnvironmentVariable(VERBOSE_VAR_NAME, VERBOSE_VAR_VALUE,
IEnvironmentVariable.ENVVAR_PREPEND, null);
}
}

497
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
View file

File diff suppressed because it is too large Load diff

21
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsProblemMarkerInfo.java
View file

@ -24,16 +24,12 @@ import org.eclipse.core.runtime.IPath;
*/
public class AutotoolsProblemMarkerInfo {
public static enum Type{
PACKAGE,
HEADER,
PROG,
public static enum Type {
PACKAGE, HEADER, PROG,
/**
* @since 1.2
*/
LIB,
FILE,
GENERIC
LIB, FILE, GENERIC
}
private ProblemMarkerInfo marker;
@ -42,18 +38,19 @@ public class AutotoolsProblemMarkerInfo {
this(file, -1, description, severity, null, null, name, type);
}
public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity, String variableName, Type type) {
public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity,
String variableName, Type type) {
this(file, lineNumber, description, severity, variableName, null, null, type);
}
public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity, String variableName,
IPath externalPath, String libraryInfo, Type type) {
public AutotoolsProblemMarkerInfo(IResource file, int lineNumber, String description, int severity,
String variableName, IPath externalPath, String libraryInfo, Type type) {
this.marker = new ProblemMarkerInfo(file, lineNumber, description, severity, variableName, externalPath);
marker.setAttribute(IAutotoolsMarker.MARKER_PROBLEM_TYPE, type.name());
marker.setAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO, libraryInfo);
marker.setType (IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER);
marker.setType(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER);
}
public ProblemMarkerInfo getMarker() {
@ -64,7 +61,7 @@ public class AutotoolsProblemMarkerInfo {
return marker.getAttribute(IAutotoolsMarker.MARKER_PROBLEM_TYPE);
}
public String getLibraryInfo(){
public String getLibraryInfo() {
return marker.getAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO);
}

27
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
View file

@ -16,24 +16,25 @@ package org.eclipse.cdt.internal.autotools.core;
import org.eclipse.cdt.autotools.core.AutotoolsPlugin;
import org.eclipse.core.runtime.QualifiedName;
public class AutotoolsPropertyConstants {
static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; //$NON-NLS-1$
static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; //$NON-NLS-1$
public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; //$NON-NLS-1$
public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOMAKE_VERSION_STRING);
public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT,
AUTOMAKE_VERSION_STRING);
public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; //$NON-NLS-1$
public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOCONF_VERSION_STRING);
public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT,
AUTOCONF_VERSION_STRING);
public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; //$NON-NLS-1$
public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); //$NON-NLS-1$
public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); //$NON-NLS-1$
public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath"); //$NON-NLS-1$
public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath"); //$NON-NLS-1$
public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath"); //$NON-NLS-1$
public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath"); //$NON-NLS-1$
public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath"); //$NON-NLS-1$
public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath"); //$NON-NLS-1$
public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath"); //$NON-NLS-1$
public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath"); //$NON-NLS-1$
public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); //$NON-NLS-1$
public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); //$NON-NLS-1$
public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
@ -41,7 +42,7 @@ public class AutotoolsPropertyConstants {
public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); //$NON-NLS-1$
public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
public static final String[] fACVersions = { "2.13", "2.59", "2.61", "2.67", "2.68" }; //$NON-NLS-1$
public static final String AC_VERSION_2_13 = fACVersions[0];
public static final String AC_VERSION_2_59 = fACVersions[1];
@ -49,12 +50,12 @@ public class AutotoolsPropertyConstants {
public static final String AC_VERSION_2_67 = fACVersions[3];
public static final String AC_VERSION_2_68 = fACVersions[4];
public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$
public static final String[] fAMVersions = { "1.4-p6", "1.9.5", "1.9.6", "1.11.1" }; //$NON-NLS-1$
public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; //$NON-NLS-1$
public static final String TRUE = "true"; //$NON-NLS-1$
public static final String FALSE = "false"; //$NON-NLS-1$
}

51
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParser.java
View file

@ -36,43 +36,39 @@ import org.eclipse.core.runtime.Path;
// which is similar to the CDT one.
public class ErrorParser extends MarkerGenerator implements IErrorParser {
public static final String ID = AutotoolsPlugin.PLUGIN_ID + ".errorParser"; //$NON-NLS-1$
private Pattern pkgconfigError =
Pattern.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$
private Pattern genconfigError =
Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$
private Pattern checkingFail =
Pattern.compile("checking for (.*)\\.\\.\\. no"); //$NON-NLS-1$
private Pattern pkgconfigError = Pattern
.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$
private Pattern genconfigError = Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$
private Pattern checkingFail = Pattern.compile("checking for (.*)\\.\\.\\. no"); //$NON-NLS-1$
private Pattern changingConfigDirectory =
Pattern.compile("Configuring in (.*)"); //$NON-NLS-1$
private Pattern changingConfigDirectory = Pattern.compile("Configuring in (.*)"); //$NON-NLS-1$
private IPath buildDir;
private IPath sourcePath;
private IProject project;
public ErrorParser(){
public ErrorParser() {
}
public ErrorParser(IPath sourcePath, IPath buildPath) {
this.buildDir = buildPath;
this.sourcePath = sourcePath;
}
@Override
public boolean processLine(String line,
org.eclipse.cdt.core.ErrorParserManager eoParser) {
public boolean processLine(String line, org.eclipse.cdt.core.ErrorParserManager eoParser) {
if (this.project == null)
this.project = eoParser.getProject();
if (this.buildDir == null)
this.buildDir = new Path(eoParser.getWorkingDirectoryURI().getPath());
if (this.sourcePath == null)
this.sourcePath = eoParser.getProject().getLocation();
AutotoolsProblemMarkerInfo marker = processLine(line);
if ( marker != null){
if (marker != null) {
// Check to see if addProblemMarker exists.
try {
Method method = eoParser.getClass().getMethod("addProblemMarker", ProblemMarkerInfo.class);
@ -92,9 +88,9 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
public boolean processLine(String line, ErrorParserManager eoParser) {
if (this.project == null)
this.project = eoParser.getProject();
AutotoolsProblemMarkerInfo marker = processLine(line);
if ( marker != null){
if (marker != null) {
eoParser.addProblemMarker(marker);
return true;
}
@ -103,9 +99,9 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
public AutotoolsProblemMarkerInfo processLine(String line) {
Matcher m;
m = changingConfigDirectory.matcher(line);
if(m.matches()){
if (m.matches()) {
// set configuration directory.
this.buildDir = this.buildDir.append(m.group(1));
this.sourcePath = this.sourcePath.append(m.group(1));
@ -114,22 +110,24 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
m = pkgconfigError.matcher(line);
if (m.matches()) {
return new AutotoolsProblemMarkerInfo(getProject(), -1, m.group(1), SEVERITY_ERROR_BUILD, null, null, m.group(2), AutotoolsProblemMarkerInfo.Type.PACKAGE);
return new AutotoolsProblemMarkerInfo(getProject(), -1, m.group(1), SEVERITY_ERROR_BUILD, null, null,
m.group(2), AutotoolsProblemMarkerInfo.Type.PACKAGE);
}
m = genconfigError.matcher(line);
if (m.matches()) {
return new AutotoolsProblemMarkerInfo(getProject(), -1, m.group(1), SEVERITY_ERROR_BUILD, null,
AutotoolsProblemMarkerInfo.Type.GENERIC);
}
m = checkingFail.matcher(line);
if (m.matches()) {
// We know that there is a 'checking for ...' fail.
// Find the log file containing this check
AutotoolsProblemMarkerInfo.Type type = getCheckType(m.group(1));
if (type != null)
return new AutotoolsProblemMarkerInfo(getProject(), "Missing " + type + " " + m.group(1), SEVERITY_INFO, m.group(1), type);
return new AutotoolsProblemMarkerInfo(getProject(), "Missing " + type + " " + m.group(1), SEVERITY_INFO,
m.group(1), type);
}
return null;
@ -139,7 +137,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
* Given the name of the filed check object, look for it in the log file
* file and then examine the configure script to figure out what the type of
* the check was.
*
*
* @param name
* @return
*/
@ -191,7 +189,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
/**
* Check the log file for the check for the given name and return the line
* number in configure where the check occurs.
*
*
* @param name
* @return
*/
@ -201,8 +199,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
if (!file.exists())
return -1;
try (LineNumberReader reader = new LineNumberReader(new FileReader(file))) {
Pattern errorPattern =
Pattern.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$
Pattern errorPattern = Pattern.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$
String line;
while ((line = reader.readLine()) != null) {
Matcher m = errorPattern.matcher(line);
@ -215,7 +212,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser {
}
return -1;
}
@Override
public IProject getProject() {
return this.project;

119
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParserManager.java
View file

@ -7,13 +7,13 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
*
* Contributors:
* IBM Corporation - initial API and implementation
* Sergey Prigogin (Google)
* James Blackburn (Broadcom) - Bug 247838
* Andrew Gvozdev (Quoin Inc)
* Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
* Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
*******************************************************************************/
package org.eclipse.cdt.internal.autotools.core;
@ -37,11 +37,11 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.URIUtil;
/**
* The purpose of ErrorParserManager is to delegate the work of error parsing
* The purpose of ErrorParserManager is to delegate the work of error parsing
* build output to {@link IErrorParser}s, assist in finding {@link IResource}s, and
* help create appropriate error/warning/info markers to be displayed
* by the Problems view.
*
*
* @noextend This class is not intended to be subclassed by clients.
*/
@SuppressWarnings("restriction")
@ -51,7 +51,7 @@ public class ErrorParserManager extends OutputStream {
* as key/value pair with key="org.eclipse.cdt.core.errorOutputParser"
* @deprecated since CDT 4.0.
*/
/**
* Delimiter for error parsers presented in one string.
* @since 5.2
@ -59,7 +59,7 @@ public class ErrorParserManager extends OutputStream {
public static final char ERROR_PARSER_DELIMITER = ';';
private int nOpens;
private int lineCounter=0;
private int lineCounter = 0;
private final IProject fProject;
private final MarkerGenerator fMarkerGenerator;
@ -74,10 +74,9 @@ public class ErrorParserManager extends OutputStream {
private OutputStream outputStream;
private final StringBuilder currentLine = new StringBuilder();
/**
* Constructor.
*
*
* @param project - project being built.
* @param markerGenerator - marker generator able to create markers.
*/
@ -85,12 +84,11 @@ public class ErrorParserManager extends OutputStream {
this(project, project.getLocationURI(), markerGenerator);
}
/**
* URI based constructor.
*
*
* @param project - project being built.
* @param baseDirectoryURI - absolute location URI of working directory of where the build is performed.
* @param baseDirectoryURI - absolute location URI of working directory of where the build is performed.
* @param markerGenerator - marker generator able to create markers.
* @since 2.0
*/
@ -134,7 +132,7 @@ public class ErrorParserManager extends OutputStream {
* {@link #pushDirectory} and {@link #popDirectory} are used to change working directory
* from where file name is searched (see {@link #findFileInWorkspace}).
* The intention is to handle make output of commands "pushd dir" and "popd".
*
*
* @param dir - another directory level to keep in stack -- corresponding to 'pushd'.
*/
public void pushDirectory(IPath dir) {
@ -156,7 +154,7 @@ public class ErrorParserManager extends OutputStream {
* {@link #pushDirectoryURI} and {@link #popDirectoryURI} are used to change working directory
* from where file name is searched (see {@link #findFileInWorkspace}).
* The intention is to handle make output of commands "pushd dir" and "popd".
*
*
* @param dir - another directory level to keep in stack -- corresponding to 'pushd'.
* @since 5.1
*/
@ -173,7 +171,7 @@ public class ErrorParserManager extends OutputStream {
* {@link #pushDirectoryURI(URI)} and {@link #popDirectoryURI()} are used to change working directory
* from where file name is searched (see {@link #findFileInWorkspace(IPath)}).
* The intention is to handle make output of commands "pushd" and "popd".
*
*
* @return previous build directory location corresponding 'popd' command.
* @since 5.1
*/
@ -194,7 +192,6 @@ public class ErrorParserManager extends OutputStream {
return fDirectoryStack.size();
}
/**
* Parses the input and tries to generate error or warning markers
*/
@ -202,7 +199,7 @@ public class ErrorParserManager extends OutputStream {
String lineTrimmed = line.trim();
lineCounter++;
ProblemMarkerInfo marker=null;
ProblemMarkerInfo marker = null;
for (ErrorParser parser : fErrorParsers.values()) {
ErrorParser curr = parser;
@ -217,7 +214,7 @@ public class ErrorParserManager extends OutputStream {
}
// standard behavior (pre 5.1) is to trim the line
String lineToParse = lineTrimmed;
if ((types & IErrorParser2.KEEP_UNTRIMMED) !=0 ) {
if ((types & IErrorParser2.KEEP_UNTRIMMED) != 0) {
// untrimmed lines
lineToParse = line;
}
@ -228,11 +225,11 @@ public class ErrorParserManager extends OutputStream {
// It should not stop parsing of the rest of output.
try {
consume = curr.processLine(lineToParse, this);
} catch (Exception e){
} catch (Exception e) {
AutotoolsPlugin.log(e);
} finally {
if (fErrors.size() > 0) {
if (marker==null)
if (marker == null)
marker = fErrors.get(0);
fErrors.clear();
}
@ -240,12 +237,12 @@ public class ErrorParserManager extends OutputStream {
if (consume)
break;
}
}
outputLine(line, marker);
}
/**
* Conditionally output line to outputStream. If stream
/**
* Conditionally output line to outputStream. If stream
* supports error markers, use it, otherwise use conventional stream
*/
private void outputLine(String line, ProblemMarkerInfo marker) {
@ -256,12 +253,12 @@ public class ErrorParserManager extends OutputStream {
try {
if (marker != null) {
if (outputStream instanceof IErrorMarkeredOutputStream) {
IErrorMarkeredOutputStream mos = (IErrorMarkeredOutputStream)outputStream;
IErrorMarkeredOutputStream mos = (IErrorMarkeredOutputStream) outputStream;
mos.write(l, marker);
}
}
byte[] b = l.getBytes();
outputStream.write(b, 0, b.length);
outputStream.write(b, 0, b.length);
} catch (IOException e) {
AutotoolsPlugin.log(e);
}
@ -275,10 +272,9 @@ public class ErrorParserManager extends OutputStream {
return lineCounter;
}
/**
* Add marker to the list of error markers.
*
*
* @param file - resource to add the new marker.
* @param lineNumber - line number of the error.
* @param desc - description of the error.
@ -292,7 +288,7 @@ public class ErrorParserManager extends OutputStream {
/**
* Add marker to the list of error markers.
*
*
* @param file - resource to add the new marker.
* @param lineNumber - line number of the error.
* @param desc - description of the error.
@ -304,19 +300,19 @@ public class ErrorParserManager extends OutputStream {
* @param varName - variable name.
* @param externalPath - external path pointing to a file outside the workspace.
*/
public void generateExternalMarker(IResource file, int lineNumber, String desc, int severity,
String varName, IPath externalPath, String libraryInfo, AutotoolsProblemMarkerInfo.Type type) {
AutotoolsProblemMarkerInfo problemMarkerInfo =
new AutotoolsProblemMarkerInfo(file, lineNumber, desc, severity, varName, externalPath, libraryInfo, type);
public void generateExternalMarker(IResource file, int lineNumber, String desc, int severity, String varName,
IPath externalPath, String libraryInfo, AutotoolsProblemMarkerInfo.Type type) {
AutotoolsProblemMarkerInfo problemMarkerInfo = new AutotoolsProblemMarkerInfo(file, lineNumber, desc, severity,
varName, externalPath, libraryInfo, type);
addProblemMarker(problemMarkerInfo);
}
/**
* Add the given marker to the list of error markers.
*
* @param problemMarkerInfo - The marker to be added
*
* @param problemMarkerInfo - The marker to be added
*/
public void addProblemMarker(AutotoolsProblemMarkerInfo problemMarkerInfo){
public void addProblemMarker(AutotoolsProblemMarkerInfo problemMarkerInfo) {
fErrors.add(problemMarkerInfo.getMarker());
fMarkerGenerator.addMarker(problemMarkerInfo);
}
@ -332,7 +328,7 @@ public class ErrorParserManager extends OutputStream {
/**
* Method setOutputStream.
* Note: you have to close this stream explicitly
* don't rely on ErrorParserManager.close().
* don't rely on ErrorParserManager.close().
* @param os - output stream
*/
public void setOutputStream(OutputStream os) {
@ -340,9 +336,9 @@ public class ErrorParserManager extends OutputStream {
}
/**
* Method getOutputStream.
* Method getOutputStream.
* Note: you have to close this stream explicitly
* don't rely on ErrorParserManager.close().
* don't rely on ErrorParserManager.close().
* @return OutputStream
*/
public OutputStream getOutputStream() {
@ -352,8 +348,8 @@ public class ErrorParserManager extends OutputStream {
/**
* @see java.io.OutputStream#close()
* Note: don't rely on this method to close underlying OutputStream,
* close it explicitly
* Note: don't rely on this method to close underlying OutputStream,
* close it explicitly
*/
@Override
public synchronized void close() {
@ -393,7 +389,7 @@ public class ErrorParserManager extends OutputStream {
// This method examines contents of currentLine buffer
// if it contains whole line this line is checked by error
// parsers (processLine method).
// parsers (processLine method).
// If flush is true rest of line is checked by error parsers.
private void checkLine(boolean flush) {
String buffer = currentLine.toString();
@ -401,8 +397,8 @@ public class ErrorParserManager extends OutputStream {
while ((i = buffer.indexOf('\n')) != -1) {
String line = buffer.substring(0, i);
// get rid of any trailing '\r'
if (line.endsWith("\r")) //$NON-NLS-1$
line=line.substring(0,line.length()-1);
if (line.endsWith("\r")) //$NON-NLS-1$
line = line.substring(0, line.length() - 1);
processLine(line);
previousLine = line;
buffer = buffer.substring(i + 1); // skip the \n and advance
@ -418,42 +414,39 @@ public class ErrorParserManager extends OutputStream {
}
}
/**
* Converts a location {@link IPath} to an {@link URI}. Contrary to
* {@link URIUtil#toURI(IPath)} this method does not assume that the path belongs
* to local file system.
*
* The returned URI uses the scheme and authority of the current working directory
* as returned by {@link #getWorkingDirectoryURI()}
*
* Converts a location {@link IPath} to an {@link URI}. Contrary to
* {@link URIUtil#toURI(IPath)} this method does not assume that the path belongs
* to local file system.
*
* The returned URI uses the scheme and authority of the current working directory
* as returned by {@link #getWorkingDirectoryURI()}
*
* @param path - the path to convert to URI.
* @return URI
* @since 5.1
*/
private URI toURI(IPath path) {
// try {
URI baseURI = getWorkingDirectoryURI();
String uriString = path.toString();
// try {
URI baseURI = getWorkingDirectoryURI();
String uriString = path.toString();
// On Windows "C:/folder/" -> "/C:/folder/"
if (path.isAbsolute() && uriString.charAt(0) != IPath.SEPARATOR)
uriString = IPath.SEPARATOR + uriString;
return EFSExtensionManager.getDefault().createNewURIFromPath(baseURI, uriString);
// On Windows "C:/folder/" -> "/C:/folder/"
if (path.isAbsolute() && uriString.charAt(0) != IPath.SEPARATOR)
uriString = IPath.SEPARATOR + uriString;
return EFSExtensionManager.getDefault().createNewURIFromPath(baseURI, uriString);
}
/**
* @param ids - array of error parser IDs
* @return error parser IDs delimited with error parser delimiter ";"
* @since 5.2
*/
public static String toDelimitedString(String[] ids) {
String result=""; //$NON-NLS-1$
String result = ""; //$NON-NLS-1$
for (String id : ids) {
if (result.length()==0) {
if (result.length() == 0) {
result = id;
} else {
result += ERROR_PARSER_DELIMITER + id;

12
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/MakeMessages.java
View file

@ -19,7 +19,7 @@ import java.util.ResourceBundle;
public class MakeMessages {
private static final String RESOURCE_BUNDLE= MakeMessages.class.getName();
private static final String RESOURCE_BUNDLE = MakeMessages.class.getName();
private static ResourceBundle fgResourceBundle;
static {
try {
@ -28,10 +28,10 @@ public class MakeMessages {
fgResourceBundle = null;
}
}
private MakeMessages() {
}
public static String getString(String key) {
try {
return fgResourceBundle.getString(key);
@ -41,10 +41,10 @@ public class MakeMessages {
return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
/**
* Gets a string from the resource bundle and formats it with the argument
*
*
* @param key the string used to get the bundle value, must not be null
*/
public static String getFormattedString(String key, Object arg) {
@ -53,7 +53,7 @@ public class MakeMessages {
/**
* Gets a string from the resource bundle and formats it with arguments
*/
*/
public static String getFormattedString(String key, Object[] args) {
return MessageFormat.format(getString(key), args);
}

49
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/MarkerGenerator.java
View file

@ -69,15 +69,14 @@ public abstract class MarkerGenerator {
if (errorVar != null) {
marker.setAttribute(IAutotoolsMarker.MARKER_VARIABLE, errorVar);
}
}
catch (CoreException e) {
} catch (CoreException e) {
AutotoolsPlugin.log(e.getStatus());
}
}
public abstract IProject getProject();
public boolean hasMarkers(IResource file) {
IMarker[] markers;
try {
@ -94,14 +93,15 @@ public abstract class MarkerGenerator {
public void addMarker(AutotoolsProblemMarkerInfo autotoolsMarker) {
ProblemMarkerInfo info = autotoolsMarker.getMarker();
try {
IResource markerResource = info.file ;
if (markerResource==null) {
IResource markerResource = info.file;
if (markerResource == null) {
markerResource = getProject();
}
IMarker[] cur = markerResource.findMarkers(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
// IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
IMarker[] cur = markerResource.findMarkers(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER, true,
IResource.DEPTH_ONE);
// IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_ONE);
/*
* Try to find matching markers and don't put in duplicates
*/
@ -110,14 +110,15 @@ public abstract class MarkerGenerator {
int line = ((Integer) cur[i].getAttribute(IMarker.LOCATION)).intValue();
int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
if (line == info.lineNumber && sev == mapMarkerSeverity(info.severity) && mesg.equals(info.description)) {
if (line == info.lineNumber && sev == mapMarkerSeverity(info.severity)
&& mesg.equals(info.description)) {
return;
}
}
}
IMarker marker = markerResource.createMarker(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER);
// IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
// IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
marker.setAttribute(IMarker.LOCATION, info.lineNumber);
marker.setAttribute(IMarker.MESSAGE, info.description);
marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(info.severity));
@ -133,36 +134,34 @@ public abstract class MarkerGenerator {
// Add all other client defined attributes.
Map<String, String> attributes = info.getAttributes();
if (attributes != null){
if (attributes != null) {
for (Entry<String, String> entry : attributes.entrySet()) {
marker.setAttribute(entry.getKey(), entry.getValue());
}
}
}
catch (CoreException e) {
} catch (CoreException e) {
AutotoolsPlugin.log(e.getStatus());
}
}
private int mapMarkerSeverity(int severity) {
switch (severity) {
case SEVERITY_ERROR_BUILD :
case SEVERITY_ERROR_RESOURCE :
return IMarker.SEVERITY_ERROR;
case SEVERITY_INFO :
return IMarker.SEVERITY_INFO;
case SEVERITY_WARNING :
return IMarker.SEVERITY_WARNING;
case SEVERITY_ERROR_BUILD:
case SEVERITY_ERROR_RESOURCE:
return IMarker.SEVERITY_ERROR;
case SEVERITY_INFO:
return IMarker.SEVERITY_INFO;
case SEVERITY_WARNING:
return IMarker.SEVERITY_WARNING;
}
return IMarker.SEVERITY_ERROR;
}
/**
* Removes the IMarkers for the project specified in the argument if the
* project exists, and is open.
*
*
* @param project
*/
public void removeAllMarkers(IProject project) {
@ -175,7 +174,7 @@ public abstract class MarkerGenerator {
IMarker[] markers;
try {
markers = project.findMarkers(IAutotoolsMarker.AUTOTOOLS_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
// markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
// markers = project.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
} catch (CoreException e) {
// Handled just about every case in the sanity check
return;

10
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/MarkerResolutionGenerator.java
View file

@ -21,11 +21,11 @@ public class MarkerResolutionGenerator implements IMarkerResolutionGenerator {
@Override
public IMarkerResolution[] getResolutions(IMarker marker) {
// System.out.println("in marker resolution, library info is " + marker.getAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO, ""));
// String libraryInfo = marker.getAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO, null);
// if (libraryInfo != null) {
// return new IMarkerResolution[] {new PkgconfigErrorResolution(libraryInfo)};
// };
// System.out.println("in marker resolution, library info is " + marker.getAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO, ""));
// String libraryInfo = marker.getAttribute(IAutotoolsMarker.MARKER_LIBRARY_INFO, null);
// if (libraryInfo != null) {
// return new IMarkerResolution[] {new PkgconfigErrorResolution(libraryInfo)};
// };
return new IMarkerResolution[0];
}

38
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/PkgconfigErrorResolution.java
View file

@ -31,11 +31,11 @@ import org.eclipse.ui.IMarkerResolution;
public class PkgconfigErrorResolution implements IMarkerResolution {
private static class ConsoleOutputStream extends OutputStream {
protected StringBuffer fBuffer;
public ConsoleOutputStream() {
fBuffer= new StringBuffer();
fBuffer = new StringBuffer();
}
public synchronized String readBuffer() {
@ -50,16 +50,16 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
ascii[0] = (byte) c;
fBuffer.append(new String(ascii));
}
@Override
@Override
public synchronized void write(byte[] b, int off, int len) {
fBuffer.append(new String(b, off, len));
}
fBuffer.append(new String(b, off, len));
}
}
private static final String PKG_UPDATE_MSG = "UpdatePackage.msg"; //$NON-NLS-1$
private String pkgName;
public PkgconfigErrorResolution(String pkgconfigRequirement) {
// Get the pkgconfig package name from the requirement message.
Pattern p = Pattern.compile("(.*?)[\\s,>,<,=].*");
@ -68,10 +68,10 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
pkgName = m.group(1);
}
}
@Override
public String getLabel() {
return AutotoolsPlugin.getFormattedString(PKG_UPDATE_MSG, new String[] {pkgName});
return AutotoolsPlugin.getFormattedString(PKG_UPDATE_MSG, new String[] { pkgName });
}
@Override
@ -85,23 +85,20 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
// Note, that we won't have any pkgconfig path settings from the configure call
// so we can't handle the situation where the user doesn't have pkgconfig files
// stored in the usual place.
IPath pkgconfigPath =
new Path("/usr/lib/pkgconfig").append(pkgName+".pc"); //$NON-NLS-1$ //$NON-NLS-2$
IPath pkgconfigPath = new Path("/usr/lib/pkgconfig").append(pkgName + ".pc"); //$NON-NLS-1$ //$NON-NLS-2$
// Get a launcher for the config command
RemoteCommandLauncher launcher = new RemoteCommandLauncher();
IPath commandPath = new Path("rpm"); //$NON-NLS-1$
String[] commandArgs =
new String[] {"-q", //$NON-NLS-1$
String[] commandArgs = new String[] { "-q", //$NON-NLS-1$
"--queryformat", //$NON-NLS-1$
"%{NAME}", //$NON-NLS-1$
"--whatprovides", //$NON-NLS-1$
pkgconfigPath.toOSString()};
pkgconfigPath.toOSString() };
try {
// Use CDT launcher to run rpm to query the package that provides
// the pkgconfig .pc file for the package in question.
ConsoleOutputStream output = new ConsoleOutputStream();
Process proc = launcher.execute(commandPath, commandArgs, null,
new Path("."), new NullProgressMonitor());
Process proc = launcher.execute(commandPath, commandArgs, null, new Path("."), new NullProgressMonitor());
if (proc != null) {
try {
// Close the input of the process since we will never write to
@ -109,8 +106,7 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
proc.getOutputStream().close();
} catch (IOException e) {
}
if (launcher.waitAndRead(output, output, new NullProgressMonitor())
!= ICommandLauncher.OK) {
if (launcher.waitAndRead(output, output, new NullProgressMonitor()) != ICommandLauncher.OK) {
AutotoolsPlugin.logErrorMessage(launcher.getErrorMessage());
} else {
String result = output.readBuffer();
@ -118,7 +114,7 @@ public class PkgconfigErrorResolution implements IMarkerResolution {
System.out.println("need to execute update of " + result);
}
}
} catch (CoreException e) {
e.printStackTrace();
}

18
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/VersionComparator.java
View file

@ -20,9 +20,9 @@ public class VersionComparator {
* Compare two version numbers if
* return -1 if v1 is older than v2 0 if they are the same and +1
* if v1 is newer than v2
*
*
* Version numbers are expected to be in the format x.y.z...
*
*
* So:
* VersionComparator.compare("1.0", "1.2") return -1
* VersionComparator.compare("1.5", "1.2") returns 1
@ -33,28 +33,28 @@ public class VersionComparator {
public static int compare(String v1, String v2) {
String[] v1digits = v1.split("\\.");
String[] v2digits = v2.split("\\.");
for (int i = 0; i < v1digits.length && i < v2digits.length; i++) {
int d1 = Integer.valueOf(v1digits[i]);
int d2 = Integer.valueOf(v2digits[i]);
if (d1 < d2)
return -1;
if (d1 > d2)
return 1;
}
// At this point all digits have the same value
// so the version with the longer string wins
if (v1digits.length < v2digits.length)
return -1;
if (v1digits.length > v2digits.length)
return 1;
return 0;
}
}

14
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AbstractConfigurationOption.java
View file

@ -25,13 +25,13 @@ public abstract class AbstractConfigurationOption implements IConfigureOption {
public AbstractConfigurationOption(String name, AutotoolsConfiguration cfg) {
this(name, name, cfg);
}
public AbstractConfigurationOption(String name, String msgName, AutotoolsConfiguration cfg) {
this.name = name;
this.msgName = msgName;
this.cfg = cfg;
}
@Override
public String getDescription() {
return ConfigureMessages.getConfigureDescription(msgName);
@ -45,7 +45,7 @@ public abstract class AbstractConfigurationOption implements IConfigureOption {
public String getMsgName() {
return msgName;
}
@Override
public String getName() {
return name;
@ -54,7 +54,7 @@ public abstract class AbstractConfigurationOption implements IConfigureOption {
public AutotoolsConfiguration getCfg() {
return cfg;
}
@Override
public List<String> getParameters() {
List<String> parameters = new ArrayList<>();
@ -62,7 +62,7 @@ public abstract class AbstractConfigurationOption implements IConfigureOption {
parameters.add(getParameter());
return parameters;
}
public String getParameterName() {
return "--" + getName();
}
@ -71,12 +71,12 @@ public abstract class AbstractConfigurationOption implements IConfigureOption {
public boolean isCategory() {
return false;
}
@Override
public boolean isFlag() {
return false;
}
@Override
public boolean isFlagValue() {
return false;

153
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
View file

@ -30,7 +30,6 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
public class AutotoolsConfiguration implements IAConfiguration {
public static class Option {
@ -39,24 +38,24 @@ public class AutotoolsConfiguration implements IAConfiguration {
private String superClassId;
private int type;
private String defaultValue;
public Option(String name, int type) {
this(name, name, type);
}
public Option(String name, String transformedName, int type) {
this.name = name;
this.transformedName = transformedName;
this.type = type;
}
public Option(String name, String transformedName, String defaultValue, int type) {
this.name = name;
this.transformedName = transformedName;
this.type = type;
this.defaultValue = defaultValue;
}
public Option(String name, String transformedName, String defaultValue, String superClassId, int type) {
this.name = name;
this.transformedName = transformedName;
@ -68,15 +67,15 @@ public class AutotoolsConfiguration implements IAConfiguration {
public String getName() {
return name;
}
public int getType() {
return type;
}
public String getDefaultValue() {
return defaultValue;
}
public String getSuperClassId() {
return superClassId;
}
@ -84,64 +83,66 @@ public class AutotoolsConfiguration implements IAConfiguration {
public String getDescription() {
return ConfigureMessages.getConfigureDescription(transformedName);
}
public String getToolTip() {
return ConfigureMessages.getConfigureTip(transformedName);
}
}
// Configure options and categories. List below is ordered.
// All options following a category are children of that category
// in a tree view, up to the next category.
private static Option[] configOpts = new Option[] {
new Option(AutotoolsOptionConstants.TOOL_CONFIGURE, IConfigureOption.TOOL),
new Option(AutotoolsOptionConstants.CATEGORY_GENERAL, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_CONFIGDIR, IConfigureOption.INTERNAL),
new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_HELP, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_QUIET, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.OPT_VERSION, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.CATEGORY_PLATFORM, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_HOST, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_BUILD, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_TARGET, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_DIRECTORIES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_PREFIX, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_LIBDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_BINDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SBINDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_INCLUDEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_DATADIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SYSCONFDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_INFODIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_MANDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SRCDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_LOCALSTATEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SHAREDSTATEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_LIBEXECDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_FILENAMES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX, "program_prefix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX, "program_suffix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.CATEGORY_ENVVAR, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_ENVVAR, IConfigureOption.ENVVAR),
new Option(AutotoolsOptionConstants.CATEGORY_FEATURES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", IConfigureOption.BIN), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG, "cflags_debug", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_CFLAGS_GPROF, "cflags_gprof", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_CFLAGS_GCOV, "cflags_gcov", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_USER, IConfigureOption.MULTIARG),
new Option(AutotoolsOptionConstants.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.CATEGORY_OPTIONS, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG),
};
new Option(AutotoolsOptionConstants.TOOL_CONFIGURE, IConfigureOption.TOOL),
new Option(AutotoolsOptionConstants.CATEGORY_GENERAL, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_CONFIGDIR, IConfigureOption.INTERNAL),
new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_HELP, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_QUIET, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.OPT_VERSION, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.CATEGORY_PLATFORM, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_HOST, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_BUILD, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_TARGET, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_DIRECTORIES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_PREFIX, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_LIBDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_BINDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SBINDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_INCLUDEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_DATADIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SYSCONFDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_INFODIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_MANDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SRCDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_LOCALSTATEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SHAREDSTATEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_LIBEXECDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_FILENAMES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX, "program_prefix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX, "program_suffix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", //$NON-NLS-1$
IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_ENVVAR, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_ENVVAR, IConfigureOption.ENVVAR),
new Option(AutotoolsOptionConstants.CATEGORY_FEATURES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", //$NON-NLS-1$
IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, //$NON-NLS-1$
IConfigureOption.FLAG),
new Option(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG, "cflags_debug", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_CFLAGS_GPROF, "cflags_gprof", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_CFLAGS_GCOV, "cflags_gcov", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_USER, IConfigureOption.MULTIARG),
new Option(AutotoolsOptionConstants.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.CATEGORY_OPTIONS, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG), };
private static Option[] toolList;
private String id;
private boolean isDirty;
private boolean isParmsDirty;
@ -156,7 +157,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
public AutotoolsConfiguration(IProject project, String name) {
this(project, name, true);
}
private AutotoolsConfiguration(IProject project, String name, boolean initialize) {
this.id = name;
this.project = project;
@ -165,7 +166,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
initConfigOptions();
isParmsDirty = true;
}
private void initConfigOptions() {
// Put configure options in hash map. Ignore categories.
ArrayList<Option> tools = new ArrayList<>();
@ -214,8 +215,8 @@ public class AutotoolsConfiguration implements IAConfiguration {
"org.eclipse.linuxtools.cdt.autotools.core.buildType.debug")) { //$NON-NLS-1$
defaultValue = "CFLAGS='-g -O0'"; //$NON-NLS-1$
try {
if (project.hasNature(CCProjectNature.CC_NATURE_ID))
defaultValue += " CXXFLAGS='-g -O0'"; //$NON-NLS-1$
if (project.hasNature(CCProjectNature.CC_NATURE_ID))
defaultValue += " CXXFLAGS='-g -O0'"; //$NON-NLS-1$
} catch (CoreException e) {
// do nothing
}
@ -244,9 +245,8 @@ public class AutotoolsConfiguration implements IAConfiguration {
configOptions.put(opt.name, f);
break;
case IConfigureOption.FLAGVALUE:
FlagValueConfigureOption fv
= new FlagValueConfigureOption(opt.name, opt.transformedName,
this, ConfigureMessages.getParameter(opt.transformedName));
FlagValueConfigureOption fv = new FlagValueConfigureOption(opt.name, opt.transformedName, this,
ConfigureMessages.getParameter(opt.transformedName));
if (defaultValue != null)
fv.setValue(defaultValue);
lastFlag.addChild(opt.name);
@ -262,7 +262,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
}
toolList = tools.toArray(new Option[tools.size()]);
}
public static Option[] getOptionList() {
return configOpts.clone();
}
@ -276,8 +276,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
for (int j = i + 1; j < configOpts.length; ++j) {
Option o = configOpts[j];
int type = o.getType();
if (type != IConfigureOption.CATEGORY &&
type != IConfigureOption.TOOL)
if (type != IConfigureOption.CATEGORY && type != IConfigureOption.TOOL)
options.add(o);
else
return options.toArray(new Option[options.size()]);
@ -290,17 +289,17 @@ public class AutotoolsConfiguration implements IAConfiguration {
options.add(o);
else if (type == IConfigureOption.TOOL)
return options.toArray(new Option[options.size()]);
}
}
}
}
}
return options.toArray(new Option[options.size()]);
}
public static Option[] getTools() {
return toolList.clone();
}
@Override
public IConfigureOption getOption(String name) {
return configOptions.get(name);
@ -310,7 +309,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
public IAConfiguration copy() {
return copy(this.id);
}
@Override
public IAConfiguration copy(String newId) {
AutotoolsConfiguration cfg = new AutotoolsConfiguration(project, newId, false);
@ -325,29 +324,29 @@ public class AutotoolsConfiguration implements IAConfiguration {
cfg.setDirty(true); // we are cloning with a new id, treat it as never built/dirty
return cfg;
}
@Override
public String getId() {
return id;
}
@Override
public boolean isDirty() {
return isDirty;
}
@Override
public void setDirty(boolean value) {
isDirty = value;
if (isDirty)
isParmsDirty = true;
}
@Override
public Map<String, IConfigureOption> getOptions() {
return configOptions;
}
@Override
public String getToolParameters(String name) {
StringBuilder buf = new StringBuilder();
@ -404,7 +403,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
}
}
}
@Override
public void setConfigToolDirectory(String configToolDirectory) {
setOption("configdir", configToolDirectory);

143
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
View file

@ -64,10 +64,10 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
public class AutotoolsConfigurationManager implements IResourceChangeListener {
public static final String CFG_FILE_NAME = ".autotools"; //$NON-NLS-1$
private static final String CFG_CANT_SAVE = "Configure.Error.NoProjectToSave"; //$NON-NLS-1$
/**
* @since 1.2
*/
@ -80,18 +80,18 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
private static AutotoolsConfigurationManager instance;
private static Random rand = new Random();
private boolean isSyncing;
private static Map<String, Map<String, IAConfiguration>> configs;
private static Map<String, Map<String, IAConfiguration>> tmpConfigs;
private AutotoolsConfigurationManager() {
configs = new HashMap<>();
tmpConfigs = new HashMap<>();
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
}
public static AutotoolsConfigurationManager getInstance() {
if (instance == null) {
instance = new AutotoolsConfigurationManager();
@ -102,7 +102,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
public synchronized IAConfiguration createDefaultConfiguration(String id) {
return new AutotoolsConfiguration(id);
}
public synchronized IAConfiguration createDefaultConfiguration(IProject project, String id) {
return new AutotoolsConfiguration(project, id);
}
@ -130,15 +130,14 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
return cfg;
}
public synchronized boolean isConfigurationAlreadySaved(IProject project, ICConfigurationDescription cfgd) {
Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
if (cfgs != null)
return cfgs.get(cfgd.getId()) != null;
return false;
}
public synchronized void addConfiguration(IProject project, IAConfiguration cfg) {
String projectName = project.getName();
Map<String, IAConfiguration> cfgs = getSavedConfigs(project);
@ -149,7 +148,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
cfgs.put(cfg.getId(), cfg);
saveConfigs(project);
}
public synchronized boolean isSyncing() {
return isSyncing;
}
@ -157,15 +156,15 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
private synchronized void setSyncing(boolean value) {
isSyncing = value;
}
/**
/**
* Synchronize the current set of configurations for the project with the
* Autotools saved configuration data. This is required when configuration
* management occurs outside of the Autotools Configure Settings page in the
* Property menu.
*
*
* @param project to synchronize configurations for
*
*
*/
public synchronized void syncConfigurations(IProject project) {
setSyncing(true);
@ -182,14 +181,15 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
clearTmpConfigurations(project);
replaceProjectConfigurations(project, newCfgList);
}
public synchronized void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs) {
String projectName = project.getName();
configs.put(projectName, cfgs);
saveConfigs(project);
}
public synchronized void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs, ICConfigurationDescription[] cfgds) {
public synchronized void replaceProjectConfigurations(IProject project, Map<String, IAConfiguration> cfgs,
ICConfigurationDescription[] cfgds) {
String projectName = project.getName();
configs.put(projectName, cfgs);
saveConfigs(project, cfgds);
@ -223,8 +223,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
cfgId = cfgIdNode.getNodeValue();
else if (nameNode != null) {
String cfgName = nameNode.getNodeValue();
ICConfigurationDescription cfgd =
CoreModel.getDefault().getProjectDescription(project).getConfigurationByName(cfgName);
ICConfigurationDescription cfgd = CoreModel.getDefault().getProjectDescription(project)
.getConfigurationByName(cfgName);
if (cfgd != null)
cfgId = cfgd.getId();
else
@ -254,7 +254,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
NamedNodeMap optionAttrs2 = flagChild.getAttributes();
Node id2 = optionAttrs2.getNamedItem("id"); //$NON-NLS-1$
Node value = optionAttrs2.getNamedItem("value"); //$NON-NLS-1$
cfg.setOption(id2.getNodeValue(), value.getNodeValue());
cfg.setOption(id2.getNodeValue(), value.getNodeValue());
}
}
}
@ -276,7 +276,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
public synchronized IAConfiguration getTmpConfiguration(IProject p, ICConfigurationDescription cfgd) {
Map <String, IAConfiguration> list = getTmpConfigs(p);
Map<String, IAConfiguration> list = getTmpConfigs(p);
IAConfiguration acfg = list.get(cfgd.getId());
if (acfg != null) {
return acfg;
@ -289,7 +289,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
/**
* Clone a configuration and put it on the tmp list if it is not already a saved configuration
* and not already on the tmp list.
*
*
* @param p project
* @param oldId the id of the old configuration to clone
* @param cfgd the configuration descriptor for the clone
@ -298,7 +298,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
public synchronized boolean cloneCfg(IProject p, String oldId, ICConfigurationDescription cfgd) {
if (isConfigurationAlreadySaved(p, cfgd))
return true;
Map <String, IAConfiguration> tmpList = getTmpConfigs(p);
Map<String, IAConfiguration> tmpList = getTmpConfigs(p);
String newId = cfgd.getId();
// Don't bother if the new configuration is already on the tmp list
IAConfiguration cfg = tmpList.get(newId);
@ -307,7 +307,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
// Otherwise, try and find the old id to copy the configuration from
// or punt if not found
IAConfiguration oldCfg = null;
Map <String, IAConfiguration> savedList = getSavedConfigs(p);
Map<String, IAConfiguration> savedList = getSavedConfigs(p);
if (savedList != null)
oldCfg = savedList.get(oldId);
if (oldCfg != null) {
@ -325,25 +325,26 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
private Map<String, IAConfiguration> getTmpConfigs(IProject p) {
Map <String, IAConfiguration> tmpList = tmpConfigs.get(p.getName());
Map<String, IAConfiguration> tmpList = tmpConfigs.get(p.getName());
if (tmpList == null) {
tmpList = new HashMap<>();
tmpConfigs.put(p.getName(), tmpList);
}
return tmpList;
}
public synchronized void clearTmpConfigurations(IProject p) {
tmpConfigs.remove(p.getName());
}
public synchronized void saveConfigs(IProject project) {
synchronized (project) {
ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project).getConfigurations();
ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(project)
.getConfigurations();
saveConfigs(project, cfgds);
}
}
private void syncNameField(ICConfigurationDescription cfgd) {
IConfiguration icfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
String id = cfgd.getId();
@ -353,8 +354,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
for (int j = 0; j < tools.length; ++j) {
ITool tool = tools[j];
if (tool.getName().equals("configure")) { //$NON-NLS-1$
IOption option =
tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
IOption option = tool
.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
IHoldsOptions h = tool;
try {
IOption optionToSet = h.getOptionToSet(option, false);
@ -365,16 +366,16 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
}
}
private String xmlEscape(String value) {
value = value.replaceAll("\\&", "&amp;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\\"", "&quot;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\\'", "&apos;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\<", "&lt;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\>", "&gt;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\&", "&amp;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\\"", "&quot;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\\'", "&apos;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\<", "&lt;"); //$NON-NLS-1$ //$NON-NLS-2$
value = value.replaceAll("\\>", "&gt;"); //$NON-NLS-1$ //$NON-NLS-2$
return value;
}
private void saveConfigs(IProject project, ICConfigurationDescription[] cfgds) {
try {
String projectName = project.getName();
@ -435,7 +436,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
AutotoolsPlugin.log(e);
}
}
// Perform apply of configuration changes. This rewrites out the current known list of configurations
// with any changes currently that have been made to them. If a configuration has been renamed, but this
// has not yet been confirmed by the end-user, then only the changes to the configuration are made. The
@ -445,11 +446,11 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IResource res = root.findMember(projectName, false);
if (res == null || res.getType() != IResource.PROJECT) {
AutotoolsPlugin.logErrorMessage(ConfigureMessages.getFormattedString(CFG_CANT_SAVE,
new String[]{projectName}));
AutotoolsPlugin.logErrorMessage(
ConfigureMessages.getFormattedString(CFG_CANT_SAVE, new String[] { projectName }));
return;
}
IProject project = (IProject)res;
IProject project = (IProject) res;
IPath output = project.getLocation().append(CFG_FILE_NAME);
File f = output.toFile();
if (!f.exists())
@ -472,7 +473,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
savedIds.add(id);
IAConfiguration cfg = getTmpConfiguration(project, cfgd);
cfgs.put(id, cfg); // add to list in case we have a new configuration not yet added to Project Description
p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
for (int j = 0; j < optionList.length; ++j) {
Option option = optionList[j];
IConfigureOption opt = cfg.getOption(option.getName());
@ -491,12 +492,13 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
// A remaining id won't appear in our savedIds list.
if (!savedIds.contains(id)) {
IAConfiguration cfg = i.getValue();
p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
p.println("<configuration id=\"" + id + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
for (int j = 0; j < optionList.length; ++j) {
Option option = optionList[j];
IConfigureOption opt = cfg.getOption(option.getName());
if (!opt.isCategory())
p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() //$NON-NLS-1$//$NON-NLS-2$
+ "\"/>"); //$NON-NLS-1$
}
p.println("</configuration>"); //$NON-NLS-1$
}
@ -508,7 +510,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
AutotoolsPlugin.log(e);
}
}
public synchronized Map<String, IAConfiguration> getConfigurations(IProject project) {
Map<String, IAConfiguration> list = getSavedConfigs(project);
if (list == null) {
@ -517,7 +519,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
return list;
}
@Override
public synchronized void resourceChanged(IResourceChangeEvent event) {
IResource res = event.getResource();
@ -547,17 +549,16 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
}
}
}
private static class AutotoolsOption implements IAutotoolsOption {
private IConfigureOption option;
private final static String UNMODIFIABLE_CONFIG_OPTION = "CfgOptions.Unmodifiable.Option"; //$NON-NLS-1$
public AutotoolsOption(IConfigureOption option) {
this.option = option;
}
@Override
public int getType() {
return option.getType();
@ -582,7 +583,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
@Override
public void setValue(String value) throws CoreException {
if (!canUpdate()) {
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
ConfigureMessages.getString(UNMODIFIABLE_CONFIG_OPTION)));
}
synchronized (option) {
@ -596,9 +597,9 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
return option.getValue();
}
}
}
private String createDummyId() {
for (;;) {
String id = "TEMP_" + rand.nextInt();
@ -606,25 +607,25 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
return id;
}
}
/**
* @since 1.2
*/
public synchronized Map<String, IAutotoolsOption> getAutotoolsCfgOptions(IProject project,
String cfgId) throws CoreException {
public synchronized Map<String, IAutotoolsOption> getAutotoolsCfgOptions(IProject project, String cfgId)
throws CoreException {
// Verify project is valid Autotools project
if (project == null || !project.hasNature(AutotoolsNewProjectNature.AUTOTOOLS_NATURE_ID)) {
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
ConfigureMessages.getString(INVALID_AUTOTOOLS_PROJECT)));
}
// Verify configuration id is valid
ICConfigurationDescription cfgd =
CoreModel.getDefault().getProjectDescription(project).getConfigurationById(cfgId);
ICConfigurationDescription cfgd = CoreModel.getDefault().getProjectDescription(project)
.getConfigurationById(cfgId);
IConfiguration icfg = ManagedBuildManager.getConfigurationForDescription(cfgd);
if (icfg == null) {
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
ConfigureMessages.getString(INVALID_AUTOTOOLS_CONFIG_ID)));
}
@ -637,30 +638,30 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
for (Iterator<Entry<String, IConfigureOption>> i = cfgOptions.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, IConfigureOption> entry = i.next();
String name = entry.getKey();
IAutotoolsOption configOption =
new AutotoolsOption(entry.getValue().copy((AutotoolsConfiguration)dummyCfg));
IAutotoolsOption configOption = new AutotoolsOption(
entry.getValue().copy((AutotoolsConfiguration) dummyCfg));
options.put(name, configOption);
}
return options;
}
/**
* @since 1.2
*/
public synchronized void updateAutotoolCfgOptions(IProject project, String cfgId,
Map<String,IAutotoolsOption> options) throws CoreException {
Map<String, IAutotoolsOption> options) throws CoreException {
// Verify project is valid Autotools project
if (project == null || !project.hasNature(AutotoolsNewProjectNature.AUTOTOOLS_NATURE_ID)) {
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
ConfigureMessages.getString(INVALID_AUTOTOOLS_PROJECT)));
}
// Verify configuration id is valid
IAConfiguration cfg = findCfg(project, cfgId);
if (cfg == null) {
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
throw new CoreException(new Status(IStatus.ERROR, AutotoolsPlugin.PLUGIN_ID,
ConfigureMessages.getString(INVALID_AUTOTOOLS_CONFIG_ID)));
}
@ -674,7 +675,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
cfgOption.setValue(option.getValue());
}
}
// Save changes
saveConfigs(project);
}

45
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
View file

@ -28,9 +28,8 @@ import org.eclipse.cdt.managedbuilder.core.ManagedOptionValueHandler;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
implements IOptionApplicability {
public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler implements IOptionApplicability {
public static final String DEFAULT_BUILD_DIR = "build"; //$NON-NLS-1$
public static final String CONFIGURE_TOOL_ID = "org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"; //$NON-NLS-1$
public static final String BUILD_DIR_OPTION_ID = "org.eclipse.linuxtools.cdt.autotools.core.option.configure.builddir"; //$NON-NLS-1$
@ -41,25 +40,21 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
//FIXME: Use holder to set option value, not the "option" parameter
@Override
public boolean handleValue(IBuildObject buildObject,
IHoldsOptions holder,
IOption option,
String extraArgument, int event)
{
public boolean handleValue(IBuildObject buildObject, IHoldsOptions holder, IOption option, String extraArgument,
int event) {
// Get the current value of the build dir option.
String value = (String)option.getValue();
String value = (String) option.getValue();
if (buildObject instanceof IConfiguration &&
(event == IManagedOptionValueHandler.EVENT_OPEN)) {
// SortedSet<Integer> nums = new TreeSet<Integer>();
IConfiguration configuration = (IConfiguration)buildObject;
if (buildObject instanceof IConfiguration && (event == IManagedOptionValueHandler.EVENT_OPEN)) {
// SortedSet<Integer> nums = new TreeSet<Integer>();
IConfiguration configuration = (IConfiguration) buildObject;
ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(configuration);
if (option.getName().equals("Name") && cfgd != null) {
String cfgId = cfgd.getId();
if (!value.isEmpty() && !value.equals(cfgId)) {
// we have a cloned configuration and we know that the
// clonee's name is the value of the option
IProject project = (IProject)configuration.getManagedProject().getOwner();
IProject project = (IProject) configuration.getManagedProject().getOwner();
String autoName = null;
String autoNameTemplate = null;
// Check if we are supposed to automatically name the build directory for any
@ -71,8 +66,8 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
// ignore
}
if (autoName == null || autoName.equals(AutotoolsPropertyConstants.TRUE)) {
autoNameTemplate = "${workspace_loc:/" + project.getName() + //$NON-NLS-1$
"}/build-" + fixName(configuration.getName()); //$NON-NLS-1$
autoNameTemplate = "${workspace_loc:/" + project.getName() + //$NON-NLS-1$
"}/build-" + fixName(configuration.getName()); //$NON-NLS-1$
IBuilder cfgBuilder = configuration.getEditableBuilder();
cfgBuilder.setBuildPath(autoNameTemplate);
}
@ -93,35 +88,31 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
}
}
}
// The event was not handled, thus return false
return true;
}
private String fixName(String cfgName) {
// Replace whitespace with underscores.
return cfgName.replaceAll("\\s", "_");
}
// IOptionApplicability methods
@Override
public boolean isOptionEnabled(IBuildObject configuration,
IHoldsOptions holder, IOption option) {
public boolean isOptionEnabled(IBuildObject configuration, IHoldsOptions holder, IOption option) {
return true;
}
@Override
public boolean isOptionUsedInCommandLine(IBuildObject configuration,
IHoldsOptions holder, IOption option) {
public boolean isOptionUsedInCommandLine(IBuildObject configuration, IHoldsOptions holder, IOption option) {
return false;
}
@Override
public boolean isOptionVisible(IBuildObject configuration,
IHoldsOptions holder, IOption option) {
public boolean isOptionVisible(IBuildObject configuration, IHoldsOptions holder, IOption option) {
return true;
}
}

18
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
View file

@ -16,7 +16,7 @@ package org.eclipse.cdt.internal.autotools.core.configure;
public class BinConfigureOption extends AbstractConfigurationOption {
private boolean value;
public BinConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
}
@ -29,25 +29,25 @@ public class BinConfigureOption extends AbstractConfigurationOption {
super(name, cfg);
this.value = value;
}
@Override
public boolean isParmSet() {
return value;
}
@Override
public String getParameter() {
if (isParmSet())
return getParameterName();
else
return ""; //$NON-NLS-1$
if (isParmSet())
return getParameterName();
else
return ""; //$NON-NLS-1$
}
@Override
public String getValue() {
return Boolean.toString(value);
}
@Override
public void setValue(String value) {
boolean oldValue = this.value;
@ -58,7 +58,7 @@ public class BinConfigureOption extends AbstractConfigurationOption {
if (this.value != oldValue)
cfg.setDirty(true);
}
@Override
public IConfigureOption copy(AutotoolsConfiguration config) {
return new BinConfigureOption(name, config, value);

14
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureMessages.java
View file

@ -20,8 +20,7 @@ import java.util.ResourceBundle;
public class ConfigureMessages {
private static final String BUNDLE_NAME = ConfigureMessages.class.getName();
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME);
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
private ConfigureMessages() {
}
@ -29,7 +28,7 @@ public class ConfigureMessages {
public static String getConfigureDescription(String name) {
return getString("Option.configure." + name); //$NON-NLS-11$
}
public static String getConfigureTip(String name) {
return getString("Option.configure." + name + ".tip"); //$NON-NLS-1$ //$NON-NLS-2$
}
@ -37,10 +36,11 @@ public class ConfigureMessages {
public static String getParameter(String name) {
return getString("Option.configure." + name + ".parm"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
* Returns the string from the resource bundle,
* or 'key' if not found.
*
*
* @param key the message key
* @return the resource bundle message
*/
@ -51,17 +51,17 @@ public class ConfigureMessages {
return '!' + key + '!';
}
}
/**
* Returns the formatted string from the resource bundle,
* or 'key' if not found.
*
*
* @param key the message key
* @param args an array of substituition strings
* @return the resource bundle message
*/
public static String getFormattedString(String key, String[] args) {
return MessageFormat.format(getString(key), (Object[])args);
return MessageFormat.format(getString(key), (Object[]) args);
}
}

10
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureOptionCategory.java
View file

@ -18,11 +18,11 @@ import java.util.ArrayList;
public class ConfigureOptionCategory implements IConfigureOption {
private String name;
public ConfigureOptionCategory(String name) {
this.name = name;
}
@Override
public IConfigureOption copy(AutotoolsConfiguration config) {
return new ConfigureOptionCategory(name);
@ -47,7 +47,7 @@ public class ConfigureOptionCategory implements IConfigureOption {
public ArrayList<String> getParameters() {
return new ArrayList<>();
}
@Override
public String getToolTip() {
return "";
@ -77,12 +77,12 @@ public class ConfigureOptionCategory implements IConfigureOption {
public boolean isMultiArg() {
return false;
}
@Override
public boolean isFlag() {
return false;
}
@Override
public boolean isFlagValue() {
return false;

12
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
View file

@ -18,7 +18,7 @@ import java.util.ArrayList;
public class ConfigureTool extends AbstractConfigurationOption {
private String value;
public ConfigureTool(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
this.value = name;
@ -33,12 +33,12 @@ public class ConfigureTool extends AbstractConfigurationOption {
super(name, cfg);
this.value = value;
}
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String newValue) {
if (!newValue.equals(value)) {
@ -51,17 +51,17 @@ public class ConfigureTool extends AbstractConfigurationOption {
public boolean isParmSet() {
return false;
}
@Override
public String getParameter() {
return ""; //$NON-NLS-1$
}
@Override
public ArrayList<String> getParameters() {
return new ArrayList<>();
}
@Override
public IConfigureOption copy(AutotoolsConfiguration config) {
return new ConfigureTool(name, config, value);

20
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagConfigureOption.java
View file

@ -21,23 +21,23 @@ public class FlagConfigureOption extends AbstractConfigurationOption {
private String value;
private ArrayList<String> children = new ArrayList<>();
public FlagConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
this.value = name;
}
public FlagConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
this.value = name;
}
private FlagConfigureOption(String name, AutotoolsConfiguration cfg, String value, ArrayList<String> children) {
super(name, cfg);
this.value = value;
this.children = new ArrayList<>(children);
}
@Override
public String getParameter() {
StringBuilder parms = new StringBuilder();
@ -56,7 +56,7 @@ public class FlagConfigureOption extends AbstractConfigurationOption {
IConfigureOption o = cfg.getOption(fvname);
if (o.isParmSet()) {
if (o instanceof IFlagConfigureValueOption) {
parm.append(separator).append(((IFlagConfigureValueOption)o).getFlags());
parm.append(separator).append(((IFlagConfigureValueOption) o).getFlags());
separator = " "; //$NON-NLS-1$
haveParm = true;
}
@ -75,7 +75,7 @@ public class FlagConfigureOption extends AbstractConfigurationOption {
public String getParameterName() {
return getName();
}
@Override
public boolean isParmSet() {
for (int i = 0; i < children.size(); ++i) {
@ -106,18 +106,18 @@ public class FlagConfigureOption extends AbstractConfigurationOption {
public int getType() {
return FLAG;
}
@Override
public boolean isFlag() {
return true;
}
public void addChild(String name) {
children.add(name);
}
public List<String> getChildren() {
return children;
}
}

14
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagValueConfigureOption.java
View file

@ -18,15 +18,13 @@ import java.util.ArrayList;
public class FlagValueConfigureOption extends BinConfigureOption implements IFlagConfigureValueOption {
private String flags;
public FlagValueConfigureOption(String name, String msgName, AutotoolsConfiguration cfg,
String flags) {
public FlagValueConfigureOption(String name, String msgName, AutotoolsConfiguration cfg, String flags) {
super(name, msgName, cfg);
this.flags = flags;
}
private FlagValueConfigureOption(String name, AutotoolsConfiguration cfg, String value,
String flags) {
private FlagValueConfigureOption(String name, AutotoolsConfiguration cfg, String value, String flags) {
super(name, cfg);
this.setValue(value);
this.flags = flags;
@ -36,7 +34,7 @@ public class FlagValueConfigureOption extends BinConfigureOption implements IFla
public ArrayList<String> getParameters() {
return new ArrayList<>();
}
@Override
public String getParameter() {
return "";
@ -61,5 +59,5 @@ public class FlagValueConfigureOption extends BinConfigureOption implements IFla
public boolean isFlagValue() {
return true;
}
}

2
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IConfigureOption.java
View file

@ -18,7 +18,7 @@ import java.util.List;
import org.eclipse.cdt.autotools.core.IAutotoolsOption;
public interface IConfigureOption {
int CATEGORY = IAutotoolsOption.CATEGORY;
int BIN = IAutotoolsOption.BIN;
int STRING = IAutotoolsOption.STRING;

2
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/IFlagConfigureValueOption.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.internal.autotools.core.configure;
public interface IFlagConfigureValueOption {
String getFlags();
}

17
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
View file

@ -16,28 +16,27 @@ package org.eclipse.cdt.internal.autotools.core.configure;
public class InternalConfigureOption extends AbstractConfigurationOption {
private String value;
public InternalConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
this.value = ""; //$NON-NLS-1$
}
public InternalConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
this.value = ""; //$NON-NLS-1$
}
private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
String value) {
private InternalConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
super(name, cfg);
this.value = value;
}
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String newValue) {
if (!newValue.equals(value)) {
@ -50,12 +49,12 @@ public class InternalConfigureOption extends AbstractConfigurationOption {
public boolean isParmSet() {
return false;
}
@Override
public String getParameter() {
return "";
}
@Override
public IConfigureOption copy(AutotoolsConfiguration config) {
return new InternalConfigureOption(name, config, value);

20
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
View file

@ -16,34 +16,32 @@ package org.eclipse.cdt.internal.autotools.core.configure;
import java.util.ArrayList;
import java.util.List;
public class MultiArgConfigureOption extends AbstractConfigurationOption {
private String value;
private List<String> userArgs;
private boolean isDirty;
public MultiArgConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
this.value = ""; //$NON-NLS-1$
}
public MultiArgConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
this.value = ""; //$NON-NLS-1$
}
private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
String value) {
private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
super(name, cfg);
this.value = value;
}
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String newValue) {
if (!newValue.equals(value)) {
@ -57,17 +55,17 @@ public class MultiArgConfigureOption extends AbstractConfigurationOption {
public boolean isParmSet() {
return value.length() > 0;
}
@Override
public boolean isMultiArg() {
return true;
}
@Override
public String getParameter() {
return value;
}
@Override
public List<String> getParameters() {
// May be multiple user-specified options in which case we

18
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
View file

@ -13,32 +13,30 @@
*******************************************************************************/
package org.eclipse.cdt.internal.autotools.core.configure;
public class StringConfigureOption extends AbstractConfigurationOption {
private String value;
public StringConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
this.value = ""; //$NON-NLS-1$
}
public StringConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
this.value = ""; //$NON-NLS-1$
}
private StringConfigureOption(String name, AutotoolsConfiguration cfg,
String value) {
private StringConfigureOption(String name, AutotoolsConfiguration cfg, String value) {
super(name, cfg);
this.value = value;
}
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String newValue) {
if (!newValue.equals(value)) {
@ -51,14 +49,14 @@ public class StringConfigureOption extends AbstractConfigurationOption {
public boolean isParmSet() {
return value.length() > 0;
}
@Override
public String getParameter() {
if (isParmSet())
return getParameterName() + "=" + getValue(); //$NON-NLS-1$
return "";
}
@Override
public IConfigureOption copy(AutotoolsConfiguration config) {
return new StringConfigureOption(name, config, value);

19
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/wizards/NewAutotoolsProject.java
View file

@ -40,7 +40,6 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
/**
* Creates a new Project in the workspace.
*/
@ -48,19 +47,20 @@ public class NewAutotoolsProject extends ProcessRunner {
protected boolean savedAutoBuildingValue;
protected ProjectCreatedActions pca;
protected IManagedBuildInfo info;
public NewAutotoolsProject() {
pca = new ProjectCreatedActions();
}
@Override
public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor)
throws ProcessFailureException {
String projectName = args[0].getSimpleValue();
String location = args[1].getSimpleValue();
String artifactExtension = args[2].getSimpleValue();
String isCProjectValue = args[3].getSimpleValue();
boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue();
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
try {
@ -85,7 +85,7 @@ public class NewAutotoolsProject extends ProcessRunner {
info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject);
AutotoolsNewProjectNature.addAutotoolsNature(project, monitor);
// For each IConfiguration, create a corresponding Autotools Configuration
IConfiguration[] cfgs = pca.getConfigs();
for (int i = 0; i < cfgs.length; ++i) {
@ -115,13 +115,13 @@ public class NewAutotoolsProject extends ProcessRunner {
workspaceDesc.setAutoBuilding(false);
workspace.setDescription(workspaceDesc);
}
protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException {
IWorkspaceDescription workspaceDesc = workspace.getDescription();
workspaceDesc.setAutoBuilding(savedAutoBuildingValue);
workspace.setDescription(workspaceDesc);
}
/**
* setOptionValue
* @param config
@ -134,7 +134,8 @@ public class NewAutotoolsProject extends ProcessRunner {
if (!option.isExtensionElement()) {
option.setValue(val);
} else {
IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
IOption newOption = config.getToolChain().createOption(option,
option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$
newOption.setValue(val);
}
}

17
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/wizards/SetAutotoolsStringOptionValue.java
View file

@ -43,13 +43,13 @@ public class SetAutotoolsStringOptionValue extends ProcessRunner {
workspace.setDescription(workspaceDesc);
} catch (CoreException e) {//ignore
}
ProcessArgument[][] resourcePathObjects = args[1].getComplexArrayValue();
for(int i=0; i<resourcePathObjects.length; i++) {
for (int i = 0; i < resourcePathObjects.length; i++) {
ProcessArgument[] resourcePathObject = resourcePathObjects[i];
String id = resourcePathObject[0].getSimpleValue();
String value = resourcePathObject[1].getSimpleValue();
setOptionValue(projectHandle, id, value);
setOptionValue(projectHandle, id, value);
}
workspaceDesc.setAutoBuilding(autoBuilding);
@ -58,16 +58,15 @@ public class SetAutotoolsStringOptionValue extends ProcessRunner {
} catch (CoreException e) {//ignore
}
}
private void setOptionValue(IProject projectHandle, String id, String value) {
AutotoolsConfigurationManager.getInstance().syncConfigurations(projectHandle);
ICConfigurationDescription[] cfgds =
CoreModel.getDefault().getProjectDescription(projectHandle).getConfigurations();
ICConfigurationDescription[] cfgds = CoreModel.getDefault().getProjectDescription(projectHandle)
.getConfigurations();
if (cfgds != null && cfgds.length >= 1) {
IAConfiguration iaConfig =
AutotoolsConfigurationManager.getInstance().getConfiguration(projectHandle,
cfgds[0].getId());
IAConfiguration iaConfig = AutotoolsConfigurationManager.getInstance().getConfiguration(projectHandle,
cfgds[0].getId());
iaConfig.setOption(id, value);
}
}

14
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
View file

@ -19,16 +19,8 @@ import org.junit.runners.Suite;
/** On Windows requires either Cygwin or MinGW to be in PATH */
@RunWith(Suite.class)
@Suite.SuiteClasses({
AutotoolsProjectTest0.class,
AutotoolsProjectNatureTest.class,
AutotoolsProjectTest1.class,
AutotoolsProjectTest2.class,
AutotoolsVirtualFolderTest.class,
AutotoolsEnvironmentVarTest.class,
LibtoolGCCBuildCommandParserTest.class,
UpdateConfigureTest.class,
EditorTests.class
})
@Suite.SuiteClasses({ AutotoolsProjectTest0.class, AutotoolsProjectNatureTest.class, AutotoolsProjectTest1.class,
AutotoolsProjectTest2.class, AutotoolsVirtualFolderTest.class, AutotoolsEnvironmentVarTest.class,
LibtoolGCCBuildCommandParserTest.class, UpdateConfigureTest.class, EditorTests.class })
public class AutomatedIntegrationSuite {
}

1
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsEnvironmentVarTest.java
View file

@ -88,4 +88,3 @@ public class AutotoolsEnvironmentVarTest {
}
}
}

17
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectNatureTest.java
View file

@ -23,17 +23,18 @@ import org.junit.Before;
import org.junit.Test;
public class AutotoolsProjectNatureTest {
@Before
public void setUp() throws CoreException {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
}
@Before
public void setUp() throws CoreException {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
}
@Test
public void testAutotoolsProjectNature() throws Exception {
IProject testProject = ProjectTools.createProject("testProject");
if(testProject == null) {
fail("Unable to create test project");
}
if (testProject == null) {
fail("Unable to create test project");
}
assertTrue(testProject.hasNature(AutotoolsNewProjectNature.AUTOTOOLS_NATURE_ID));
testProject.delete(true, false, ProjectTools.getMonitor());
}

30
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java
View file

@ -28,25 +28,26 @@ import org.junit.Before;
import org.junit.Test;
public class AutotoolsProjectTest0 {
private IProject testProject;
@Before
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
testProject = ProjectTools.createProject("testProject0");
if (testProject == null) {
fail("Unable to create test project");
}
fail("Unable to create test project");
}
testProject.open(new NullProgressMonitor());
}
/**
* Test sample project which has a hello world program. The top-level
* configure is found in the top-level directory. The hello world source
* is found in sample/hello.c.
* @throws Exception
*/
}
/**
* Test sample project which has a hello world program. The top-level
* configure is found in the top-level directory. The hello world source
* is found in sample/hello.c.
* @throws Exception
*/
@Test
public void testAutotoolsProject0() throws Exception {
Path p = new Path("zip/project1.zip");
@ -72,6 +73,7 @@ public class AutotoolsProjectTest0 {
x = new org.eclipse.core.runtime.Path("sample/Makefile");
assertTrue(testProject.exists(x));
}
@After
public void tearDown() throws Exception {
testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

34
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java
View file

@ -28,27 +28,28 @@ import org.junit.Before;
import org.junit.Test;
public class AutotoolsProjectTest1 {
private IProject testProject;
@Before
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
testProject = ProjectTools.createProject("testProject1");
if (testProject == null) {
fail("Unable to create test project");
}
fail("Unable to create test project");
}
testProject.open(new NullProgressMonitor());
}
/**
* Test sample project which has a hello world program. The top-level
* configure is found in the subdirectory src which also contains the
* subdirectory sample. The hello world source is found in
* src/sample/hello.c so configuration must create multiple
* Makefiles.
* @throws Exception
*/
}
/**
* Test sample project which has a hello world program. The top-level
* configure is found in the subdirectory src which also contains the
* subdirectory sample. The hello world source is found in
* src/sample/hello.c so configuration must create multiple
* Makefiles.
* @throws Exception
*/
@Test
public void testAutotoolsProject1() throws Exception {
Path p = new Path("zip/project1.zip");
@ -75,6 +76,7 @@ public class AutotoolsProjectTest1 {
x = new org.eclipse.core.runtime.Path("sample/Makefile");
assertTrue(testProject.exists(x));
}
@After
public void tearDown() throws Exception {
testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

34
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java
View file

@ -31,27 +31,28 @@ import org.junit.Test;
// This test verifies an autogen.sh project that builds configure, but
// does not run it.
public class AutotoolsProjectTest2 {
private IProject testProject;
@Before
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
testProject = ProjectTools.createProject("testProject2");
if (testProject == null) {
fail("Unable to create test project");
}
fail("Unable to create test project");
}
testProject.open(new NullProgressMonitor());
}
/**
* Test sample project which has a hello world program. The top-level
* contains autogen.sh which will build configure, but not run it.
* The hello world source is found in
* src/sample/hello.c so configuration must create multiple
* Makefiles.
* @throws Exception
*/
}
/**
* Test sample project which has a hello world program. The top-level
* contains autogen.sh which will build configure, but not run it.
* The hello world source is found in
* src/sample/hello.c so configuration must create multiple
* Makefiles.
* @throws Exception
*/
@Test
public void testAutotoolsProject2() throws Exception {
Path p = new Path("zip/project2.zip");
@ -89,6 +90,7 @@ public class AutotoolsProjectTest2 {
x = new org.eclipse.core.runtime.Path("sample/Makefile");
assertTrue(testProject.exists(x));
}
@After
public void tearDown() throws Exception {
testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

2
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsVirtualFolderTest.java
View file

@ -51,7 +51,7 @@ public class AutotoolsVirtualFolderTest {
/**
* Test sample project with a virtual folder that points to configure scripts.
* Tests Bug 434275 - Autotools configuration in subfolder not found
* Tests Bug 434275 - Autotools configuration in subfolder not found
* @throws Exception
*/
@Test

142
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java
View file

@ -60,23 +60,22 @@ import org.eclipse.ui.wizards.datatransfer.ImportOperation;
import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
import org.osgi.framework.FrameworkUtil;
@SuppressWarnings("restriction")
public class ProjectTools {
static IWorkspace workspace;
static IWorkspaceRoot root;
static NullProgressMonitor monitor;
static String pluginRoot;
static ConvertProjectWizardPage page;
static boolean setupComplete;
static IWorkspaceRoot root;
static NullProgressMonitor monitor;
static String pluginRoot;
static ConvertProjectWizardPage page;
static boolean setupComplete;
/**
* Setup routine for tests.
* @return true if setup successful, false otherwise
* @throws CoreException
*/
public static boolean setup() throws CoreException {
/**
* Setup routine for tests.
* @return true if setup successful, false otherwise
* @throws CoreException
*/
public static boolean setup() throws CoreException {
if (!setupComplete) {
IWorkspaceDescription desc;
workspace = ResourcesPlugin.getWorkspace();
@ -95,7 +94,7 @@ public class ProjectTools {
setupComplete = true;
return true;
}
/**
* Build the project.
* @return true if build started successfully or false otherwise
@ -105,11 +104,11 @@ public class ProjectTools {
workspace.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor());
workspace.getRoot().refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
} catch (CoreException e) {
return false;
return false;
}
return true;
}
/**
* Get the default monitor.
* @return The current monitor
@ -145,7 +144,7 @@ public class ProjectTools {
// if the path points to an actual object, use its resource to get its run path location
// which will handle any linked directories
if (project.findMember(filePath) != null)
runPath = project.findMember(filePath).getLocation().removeLastSegments(1);
runPath = project.findMember(filePath).getLocation().removeLastSegments(1);
String[] args = new String[2];
args[0] = "+x";
// if the path points to an actual object, use its resource to get its location
@ -155,8 +154,7 @@ public class ProjectTools {
else // otherwise, just append to project location
args[1] = project.getLocation().append(filePath).toOSString();
try {
Process proc = launcher.execute(commandPath, args, new String[0],
runPath, new NullProgressMonitor());
Process proc = launcher.execute(commandPath, args, new String[0], runPath, new NullProgressMonitor());
if (proc != null) {
try {
// Close the input of the process since we will never write to
@ -176,7 +174,7 @@ public class ProjectTools {
}
return true;
}
// Inner class to allow us to fake a project wizard without starting up
// the UI for it.
protected static class ConvertToAutotoolsProjectWizardTest extends ConvertToAutotoolsProjectWizard {
@ -194,30 +192,32 @@ public class ProjectTools {
@Override
public void applyOptions(IProject project, IProgressMonitor monitor) {
setCurrentProject(project);
}
}
@Override
public IConfiguration[] getSelectedConfigurations() {
IProjectType projectType = ManagedBuildManager.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
IProjectType projectType = ManagedBuildManager
.getExtensionProjectType("org.eclipse.linuxtools.cdt.autotools.core.projectType"); //$NON-NLS-1$
return projectType.getConfigurations();
}
}
/**
* Creates an empty Autotools project.
* @param name The name of the new project
* @return The newly created project or null
*/
*/
public static IProject createProject(String name) {
IProject testProject = root.getProject(name);
if (testProject == null) {
return null;
}
}
IProjectDescription description = workspace.newProjectDescription(name);
try {
testProject.create(monitor);
testProject.open(monitor);
IProject newProject = CCorePlugin.getDefault().createCDTProject(description, testProject, SubMonitor.convert(monitor,25));
IProject newProject = CCorePlugin.getDefault().createCDTProject(description, testProject,
SubMonitor.convert(monitor, 25));
ConvertToAutotoolsProjectWizardTest wizard = new ConvertToAutotoolsProjectWizardTest();
wizard.addPages();
ConvertToAutotoolsProjectWizardPage page = new ConvertToAutotoolsProjectWizardPage("test", wizard);
@ -227,7 +227,7 @@ public class ProjectTools {
}
return testProject;
}
/**
* Set the configuration source directory for an Autotools project.
* @param project The Autotools project to modify
@ -241,11 +241,13 @@ public class ProjectTools {
IAConfiguration cfg = AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
cfg.setConfigToolDirectory(dir);
}
private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
ZipFileStructureProvider structureProvider= new ZipFileStructureProvider(srcZipFile);
private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor)
throws InvocationTargetException {
ZipFileStructureProvider structureProvider = new ZipFileStructureProvider(srcZipFile);
try {
ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
ImportOperation op = new ImportOperation(destPath, structureProvider.getRoot(), structureProvider,
new ImportOverwriteQuery());
op.run(monitor);
} catch (InterruptedException e) {
// should not happen
@ -257,17 +259,16 @@ public class ProjectTools {
CommandLauncher launcher = new CommandLauncher();
OutputStream stdout = new ByteArrayOutputStream();
OutputStream stderr = new ByteArrayOutputStream();
IPath runPath = root.getLocation().append(destPath);
// Run the genfiles.sh shell script which will simulate
// running aclocal, autoconf, and automake
launcher.showCommand(true);
IPath commandPath = new Path("sh");
String[] cmdargs = new String[]{"genfiles.sh"};
String[] cmdargs = new String[] { "genfiles.sh" };
try {
Process proc = launcher.execute(commandPath, cmdargs, new String[0],
runPath, new NullProgressMonitor());
Process proc = launcher.execute(commandPath, cmdargs, new String[0], runPath, new NullProgressMonitor());
if (proc != null) {
try {
// Close the input of the process since we will never write to
@ -276,8 +277,8 @@ public class ProjectTools {
} catch (IOException e) {
}
if (launcher.waitAndRead(stdout, stderr, SubMonitor.convert(
monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
if (launcher.waitAndRead(stdout, stderr,
SubMonitor.convert(monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK) {
return false;
}
} else
@ -289,42 +290,43 @@ public class ProjectTools {
return true;
}
private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
private static void importFilesFromZipAndGenerate(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor)
throws InvocationTargetException {
importFilesFromZip(srcZipFile, destPath, monitor);
if (!generateFiles(destPath))
throw new InvocationTargetException(new Exception("Unsuccessful test file generation"));
}
private static class ImportOverwriteQuery implements IOverwriteQuery {
@Override
public String queryOverwrite(String file) {
return ALL;
}
}
}
}
/**
* Adds a source container to a IProject.
* @param jproject The parent project
* @param containerName The name of the new source container
* @return The handle to the new source container
* @throws CoreException Creation failed
*/
*/
public static IContainer addSourceContainer(IProject jproject, String containerName) throws CoreException {
IProject project= jproject.getProject();
IContainer container= null;
IProject project = jproject.getProject();
IContainer container = null;
if (containerName == null || containerName.length() == 0) {
container= project;
container = project;
} else {
IFolder folder= project.getFolder(containerName);
IFolder folder = project.getFolder(containerName);
if (!folder.exists()) {
createFolder(folder, false, true, null);
}
container= folder;
container = folder;
}
return container;
}
/**
* Adds a source container to a IProject and imports all files contained
* in the given ZIP file.
@ -337,10 +339,11 @@ public class ProjectTools {
* @throws InvocationTargetException Creation failed
* @throws CoreException Creation failed
* @throws IOException Creation failed
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile, boolean generate) throws InvocationTargetException, CoreException, IOException {
try (ZipFile file= new ZipFile(zipFile)){
IContainer root= addSourceContainer(project, containerName);
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, File zipFile,
boolean generate) throws InvocationTargetException, CoreException, IOException {
try (ZipFile file = new ZipFile(zipFile)) {
IContainer root = addSourceContainer(project, containerName);
if (generate)
importFilesFromZipAndGenerate(file, root.getFullPath(), null);
else
@ -360,12 +363,14 @@ public class ProjectTools {
* @throws InvocationTargetException Creation failed
* @throws CoreException Creation failed
* @throws IOException Creation failed
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath, boolean generate) throws InvocationTargetException, CoreException, IOException {
File zipFile = new File(FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(ProjectTools.class), zipFilePath, null)).getFile());
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath,
boolean generate) throws InvocationTargetException, CoreException, IOException {
File zipFile = new File(FileLocator
.toFileURL(FileLocator.find(FrameworkUtil.getBundle(ProjectTools.class), zipFilePath, null)).getFile());
return addSourceContainerWithImport(project, containerName, zipFile, generate);
}
/**
* Adds a source container to a IProject and imports all files contained
* in the given ZIP file.
@ -376,8 +381,9 @@ public class ProjectTools {
* @throws InvocationTargetException Creation failed
* @throws CoreException Creation failed
* @throws IOException Creation failed
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath) throws InvocationTargetException, CoreException, IOException {
*/
public static IContainer addSourceContainerWithImport(IProject project, String containerName, Path zipFilePath)
throws InvocationTargetException, CoreException, IOException {
return addSourceContainerWithImport(project, containerName, zipFilePath, false);
}
@ -395,17 +401,18 @@ public class ProjectTools {
file.setContents(new ByteArrayInputStream(contents.getBytes()), false, false, null);
return file;
}
/**
* Create a linked folder for a project
* @param project The project
* @param folderName Name of the linked folder in the project
* @param path The URI of the real file/folder
*
*
* @return
* @throws CoreException
*/
public static IFolder createLinkedFolder(IProject project, String folderName, final URI linkTarget) throws Exception {
public static IFolder createLinkedFolder(IProject project, String folderName, final URI linkTarget)
throws Exception {
final IFolder folderHandle = root.getFolder(project.getFullPath().append(folderName));
WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
@ -439,14 +446,15 @@ public class ProjectTools {
* <code> org.eclipse.ui.dialogs.ContainerGenerator</code> is too heavy
* (creates a runnable)
*/
public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor) throws CoreException {
public static void createFolder(IFolder folder, boolean force, boolean local, IProgressMonitor monitor)
throws CoreException {
if (!folder.exists()) {
IContainer parent= folder.getParent();
IContainer parent = folder.getParent();
if (parent instanceof IFolder) {
createFolder((IFolder)parent, force, local, null);
createFolder((IFolder) parent, force, local, null);
}
folder.create(force, local, monitor);
}
}
}

215
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java
View file

@ -54,24 +54,25 @@ import org.xml.sax.SAXException;
// This test verifies an autogen.sh project that builds configure, but
// does not run it.
public class UpdateConfigureTest {
private IProject testProject;
@Before
public void setUp() throws Exception {
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
testProject = ProjectTools.createProject("testProject2");
if (testProject == null) {
fail("Unable to create test project");
}
fail("Unable to create test project");
}
testProject.open(new NullProgressMonitor());
}
/**
* Test setting the special advanced options for gcov, gprof, and debug flags. Verify that
* the configure script sets both the C and C++ flags.
* @throws Exception
*/
}
/**
* Test setting the special advanced options for gcov, gprof, and debug flags. Verify that
* the configure script sets both the C and C++ flags.
* @throws Exception
*/
@Test
public void testGprofGcovDebugFlagOptions() throws Exception {
Path p = new Path("zip/project2.zip");
@ -80,48 +81,50 @@ public class UpdateConfigureTest {
ProjectTools.setConfigDir(testProject, "src");
ProjectTools.markExecutable(testProject, "src/autogen.sh");
assertTrue(ProjectTools.build());
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject)
.getActiveConfiguration();
IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
assertTrue(cfg.getName().equals("Build (GNU)"));
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance()
.getAutotoolsCfgOptions(testProject, cfg.getId());
IAutotoolsOption k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
k.setValue("true");
// Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project
assertTrue(ProjectTools.build());
org.eclipse.core.runtime.Path x = new org.eclipse.core.runtime.Path("config.log");
assertTrue(testProject.exists(x));
IResource r = testProject.findMember(x);
File f = r.getLocation().toFile();
char[] cbuf = new char[2000];
try (FileReader fr = new FileReader(f)) {
fr.read(cbuf);
String s = new String(cbuf);
assertTrue(s.contains("testProject2/src/configure CFLAGS=-pg CXXFLAGS=-pg"));
}
// Reset gprof opt and set gcov opt
opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
k.setValue("false");
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV);
k.setValue("true");
// Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project
assertTrue(ProjectTools.build());
r = testProject.findMember(x);
f = r.getLocation().toFile();
try (FileReader fr = new FileReader(f)) {
@ -131,21 +134,21 @@ public class UpdateConfigureTest {
"testProject2/src/configure CFLAGS=-fprofile-arcs -ftest-coverage CXXFLAGS=-fprofile-arcs -ftest-coverage"));
}
// Reset gcov opt and set debug opt
opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV);
k.setValue("false");
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG);
k.setValue("true");
// Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project
assertTrue(ProjectTools.build());
r = testProject.findMember(x);
f = r.getLocation().toFile();
try (FileReader fr = new FileReader(f)) {
@ -154,12 +157,12 @@ public class UpdateConfigureTest {
assertTrue(s.contains("testProject2/src/configure CFLAGS=-g CXXFLAGS=-g"));
}
}
/**
* Test getting and updating configuration options for an Autotools Project. The top-level
* contains autogen.sh which will build configure, but not run it.
* @throws Exception
*/
/**
* Test getting and updating configuration options for an Autotools Project. The top-level
* contains autogen.sh which will build configure, but not run it.
* @throws Exception
*/
@Test
public void testGetAndUpdateConfigureOptions() throws Exception {
Path p = new Path("zip/project2.zip");
@ -168,10 +171,12 @@ public class UpdateConfigureTest {
ProjectTools.setConfigDir(testProject, "src");
ProjectTools.markExecutable(testProject, "src/autogen.sh");
assertTrue(ProjectTools.build());
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject)
.getActiveConfiguration();
IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
assertTrue(cfg.getName().equals("Build (GNU)"));
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance()
.getAutotoolsCfgOptions(testProject, cfg.getId());
IAutotoolsOption configdir = opts.get(AutotoolsOptionConstants.OPT_CONFIGDIR);
assertEquals(configdir.getType(), IAutotoolsOption.INTERNAL);
assertTrue(configdir.getValue().equals("src"));
@ -203,7 +208,7 @@ public class UpdateConfigureTest {
k = opts.get(AutotoolsOptionConstants.FLAG_CFLAGS);
assertFalse(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.FLAG);
// Tools are ok to update
k = opts.get(AutotoolsOptionConstants.TOOL_AUTOGEN);
assertTrue(k.canUpdate());
@ -223,13 +228,13 @@ public class UpdateConfigureTest {
assertEquals(k.getType(), IAutotoolsOption.FLAGVALUE);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.FLAGVALUE);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.FLAGVALUE);
@ -248,181 +253,181 @@ public class UpdateConfigureTest {
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/bin");
k = opts.get(AutotoolsOptionConstants.OPT_BUILD);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("linux");
k = opts.get(AutotoolsOptionConstants.OPT_CACHE_FILE);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("config.status");
k = opts.get(AutotoolsOptionConstants.OPT_DATADIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/data");
k = opts.get(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.BIN);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_EXEC_PREFIX);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/exec");
k = opts.get(AutotoolsOptionConstants.OPT_HELP);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.BIN);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_HOST);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("linux");
k = opts.get(AutotoolsOptionConstants.OPT_INCLUDEDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/include");
k = opts.get(AutotoolsOptionConstants.OPT_INFODIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/info");
k = opts.get(AutotoolsOptionConstants.OPT_LIBDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/lib");
k = opts.get(AutotoolsOptionConstants.OPT_LIBEXECDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/libexec");
k = opts.get(AutotoolsOptionConstants.OPT_LOCALSTATEDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/localstate");
k = opts.get(AutotoolsOptionConstants.OPT_MANDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/man");
k = opts.get(AutotoolsOptionConstants.OPT_NO_CREATE);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.BIN);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/oldinclude");
k = opts.get(AutotoolsOptionConstants.OPT_PREFIX);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("prefix");
k = opts.get(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("program_prefix");
k = opts.get(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("program_suffix");
k = opts.get(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("program_transform_name");
k = opts.get(AutotoolsOptionConstants.OPT_QUIET);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.BIN);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
k = opts.get(AutotoolsOptionConstants.OPT_SBINDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/sbin");
k = opts.get(AutotoolsOptionConstants.OPT_SHAREDSTATEDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/sharedstate");
k = opts.get(AutotoolsOptionConstants.OPT_SRCDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("src");
k = opts.get(AutotoolsOptionConstants.OPT_SYSCONFDIR);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("/usr/sysconf");
k = opts.get(AutotoolsOptionConstants.OPT_TARGET);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.STRING);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("target");
k = opts.get(AutotoolsOptionConstants.OPT_USER);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.MULTIARG);
assertEquals(k.getValue(), ""); //$NON-NLS-1$
k.setValue("user opts");
k = opts.get(AutotoolsOptionConstants.OPT_VERSION);
assertTrue(k.canUpdate());
assertEquals(k.getType(), IAutotoolsOption.BIN);
assertEquals(k.getValue(), "false"); //$NON-NLS-1$
k.setValue("true");
// Verify last option changed has changed in our copy, but not
// in the actual options
assertEquals(k.getValue(), "true");
Map<String, IAutotoolsOption> opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
Map<String, IAutotoolsOption> opts2 = AutotoolsConfigurationManager.getInstance()
.getAutotoolsCfgOptions(testProject, cfg.getId());
IAutotoolsOption k2 = opts2.get(AutotoolsOptionConstants.OPT_VERSION);
assertEquals(k2.getValue(), "false");
// Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId());
// Verify new option values
k = opts2.get(AutotoolsOptionConstants.TOOL_AUTOGEN);
assertEquals(k.getValue(), "autogen2.sh"); //$NON-NLS-1$
@ -432,10 +437,10 @@ public class UpdateConfigureTest {
k = opts2.get(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
@ -444,85 +449,85 @@ public class UpdateConfigureTest {
k = opts2.get(AutotoolsOptionConstants.OPT_BINDIR);
assertEquals(k.getValue(), "/usr/bin"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_BUILD);
assertEquals(k.getValue(), "linux"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_CACHE_FILE);
assertEquals(k.getValue(), "config.status"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_DATADIR);
assertEquals(k.getValue(), "/usr/data"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_EXEC_PREFIX);
assertEquals(k.getValue(), "/usr/exec"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_HELP);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_HOST);
assertEquals(k.getValue(), "linux"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_INCLUDEDIR);
assertEquals(k.getValue(), "/usr/include"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_INFODIR);
assertEquals(k.getValue(), "/usr/info"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_LIBDIR);
assertEquals(k.getValue(), "/usr/lib"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_LIBEXECDIR);
assertEquals(k.getValue(), "/usr/libexec"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_LOCALSTATEDIR);
assertEquals(k.getValue(), "/usr/localstate"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_MANDIR);
assertEquals(k.getValue(), "/usr/man"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_NO_CREATE);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR);
assertEquals(k.getValue(), "/usr/oldinclude"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_PREFIX);
assertEquals(k.getValue(), "prefix"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX);
assertEquals(k.getValue(), "program_prefix"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX);
assertEquals(k.getValue(), "program_suffix"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME);
assertEquals(k.getValue(), "program_transform_name"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_QUIET);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_SBINDIR);
assertEquals(k.getValue(), "/usr/sbin"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_SHAREDSTATEDIR);
assertEquals(k.getValue(), "/usr/sharedstate"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_SRCDIR);
assertEquals(k.getValue(), "src"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_SYSCONFDIR);
assertEquals(k.getValue(), "/usr/sysconf"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_TARGET);
assertEquals(k.getValue(), "target"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_USER);
assertEquals(k.getValue(), "user opts"); //$NON-NLS-1$
k = opts2.get(AutotoolsOptionConstants.OPT_VERSION);
assertEquals(k.getValue(), "true"); //$NON-NLS-1$
@ -552,12 +557,12 @@ public class UpdateConfigureTest {
}
}
}
} catch (IOException|ParserConfigurationException|SAXException e) {
} catch (IOException | ParserConfigurationException | SAXException e) {
e.printStackTrace();
}
}
@After
public void tearDown() throws Exception {
testProject.refreshLocal(IResource.DEPTH_INFINITE, null);

58
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeColourizationTests.java
View file

@ -40,39 +40,31 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class AutomakeColourizationTests {
private ProjectTools tools;
private IProject project;
private IFile makefileAmFile;
static String makefileAmContents =
"# This is a comment" + "\n" +
"if CONDITION" + "\n" +
"MACRO = case1" + "\n" +
"else" + "\n" +
"MACRO = case2" + "\n" +
"$(MACRO)" + "\n" +
"${MACRO}" + "\n" +
"";
static String makefileAmContents = "# This is a comment" + "\n" + "if CONDITION" + "\n" + "MACRO = case1" + "\n"
+ "else" + "\n" + "MACRO = case2" + "\n" + "$(MACRO)" + "\n" + "${MACRO}" + "\n" + "";
private IWorkbench workbench;
private AutomakefileCodeScanner codeScanner;
@Before
public void setUp() throws Exception {
tools = new ProjectTools();
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
project = ProjectTools.createProject("testProjectACT");
if(project == null) {
fail("Unable to create test project");
}
project.open(new NullProgressMonitor());
public void setUp() throws Exception {
tools = new ProjectTools();
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
project = ProjectTools.createProject("testProjectACT");
if (project == null) {
fail("Unable to create test project");
}
project.open(new NullProgressMonitor());
Display.getDefault().syncExec(() -> {
try {
makefileAmFile = tools.createFile(project, "Makefile.am", makefileAmContents);
@ -95,11 +87,12 @@ public class AutomakeColourizationTests {
}
});
}
IToken getNextToken() {
return codeScanner.nextToken();
}
}
IToken getNextToken() {
return codeScanner.nextToken();
}
@Test
public void testAutomakeEditorColourization() {
// # This is a comment
@ -211,7 +204,7 @@ public class AutomakeColourizationTests {
token = (Token) token0;
attribute = (TextAttribute) token.getData();
assertNull(attribute);
// ${MACRO}
token0 = getNextToken();
assertTrue(token0 instanceof Token);
@ -222,6 +215,7 @@ public class AutomakeColourizationTests {
attribute = (TextAttribute) token.getData();
assertEquals(ColorManager.MAKE_MACRO_REF_RGB, attribute.getForeground().getRGB());
}
@After
public void tearDown() throws Exception {
project.delete(true, false, ProjectTools.getMonitor());

29
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeEditorTests.java
View file

@ -28,29 +28,28 @@ import org.eclipse.ui.PlatformUI;
import org.junit.Before;
import org.junit.Test;
public class AutomakeEditorTests {
private ProjectTools tools;
private IProject project;
@Before
public void setUp() throws Exception {
tools = new ProjectTools();
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
}
public void setUp() throws Exception {
tools = new ProjectTools();
if (!ProjectTools.setup())
fail("could not perform basic project workspace setup");
}
@Test
public void testAutomakeEditorAssociation() throws Exception {
project = ProjectTools.createProject("testProjectAET");
if(project == null) {
fail("Unable to create test project");
}
if (project == null) {
fail("Unable to create test project");
}
project.open(new NullProgressMonitor());
Display.getDefault().syncExec(() -> {
try {
IFile makefileAmFile = tools.createFile(project, "Makefile.am", "");

47
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/AutomakeTextHoverTest.java
View file

@ -35,7 +35,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class AutomakeTextHoverTest {
private ProjectTools tools;
@ -51,27 +50,24 @@ public class AutomakeTextHoverTest {
// ie. '\techo ' == 6 characters
"MACRO = case1" + "\n" +
// 14
"target1:" + "\n" +
// 23 (before the tab)
// 32 is after the M in MACRO
"\t" + "echo $(MACRO)" + "\n" +
// 38 (before the tab)
"\t" + "echo $@" + "\n" +
"\n" +
// 48
"target2: target1" + "\n" +
// 65 (before the tab)
"\t" + "echo ${MACRO}" + "\n" +
// 80 (before the tab)
"\t" + "echo $@" + "\n" +
// 89 (before the tab)
"\t" + "echo $<" + "\n" +
"\n" +
// 99
"target3: target1 target2" + "\n" +
// 124 (before the tab)
"\t" + "echo $?" + "\n" +
"";
"target1:" + "\n" +
// 23 (before the tab)
// 32 is after the M in MACRO
"\t" + "echo $(MACRO)" + "\n" +
// 38 (before the tab)
"\t" + "echo $@" + "\n" + "\n" +
// 48
"target2: target1" + "\n" +
// 65 (before the tab)
"\t" + "echo ${MACRO}" + "\n" +
// 80 (before the tab)
"\t" + "echo $@" + "\n" +
// 89 (before the tab)
"\t" + "echo $<" + "\n" + "\n" +
// 99
"target3: target1 target2" + "\n" +
// 124 (before the tab)
"\t" + "echo $?" + "\n" + "";
private IWorkbench workbench;
@Before
@ -82,7 +78,7 @@ public class AutomakeTextHoverTest {
project = ProjectTools.createProject("testProjectATHT");
if(project == null) {
if (project == null) {
fail("Unable to create test project");
}
@ -131,6 +127,7 @@ public class AutomakeTextHoverTest {
assertEquals("target1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
});
}
@Test
public void testGetHoverInfoTargetName2() {
// hover between the $ and the @ in target2
@ -149,6 +146,7 @@ public class AutomakeTextHoverTest {
assertEquals("target2", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
});
}
@Test
public void testGetHoverInfoForTargetDependency() {
// hover between the $ and the < in target2
@ -167,6 +165,7 @@ public class AutomakeTextHoverTest {
assertEquals("target1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
});
}
@Test
public void testGetHoverInfoForTargetDependencies() {
// hover between the $ and the ? in target3
@ -186,6 +185,7 @@ public class AutomakeTextHoverTest {
textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
});
}
@Test
public void testGetHoverForMacro1() {
Display.getDefault().syncExec(() -> {
@ -204,6 +204,7 @@ public class AutomakeTextHoverTest {
assertEquals("case1", textHover.getHoverInfo(automakeEditor.getAutomakeSourceViewer(), hoverRegion));
});
}
@Test
public void testGetHoverForMacro2() {
// hover between the M and the A in the ${MACRO} reference in target2

6
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTests.java
View file

@ -17,10 +17,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
AutomakeColourizationTests.class,
AutomakeTextHoverTest.class,
AutomakeEditorTests.class
})
@Suite.SuiteClasses({ AutomakeColourizationTests.class, AutomakeTextHoverTest.class, AutomakeEditorTests.class })
public class EditorTests {
}

60
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AbstractTest.java
View file

@ -125,8 +125,7 @@ public abstract class AbstractTest {
SWTBotShell shell = bot.shell("Preferences");
shell.activate();
bot.text().setText("Workspace");
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General",
"Workspace"));
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General", "Workspace"));
SWTBotCheckBox buildAuto = bot.checkBox("Build automatically");
if (buildAuto != null && buildAuto.isChecked()) {
buildAuto.click();
@ -135,10 +134,8 @@ public abstract class AbstractTest {
// Ensure that the C/C++ perspective is chosen automatically
// and doesn't require user intervention
bot.text().setText("Perspectives");
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General",
"Perspectives"));
clickRadioButtonInGroup("Always open",
"Open the associated perspective when creating a new project");
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "General", "Perspectives"));
clickRadioButtonInGroup("Always open", "Open the associated perspective when creating a new project");
bot.button("OK").click();
AbstractTest.projectName = projectName;
@ -146,18 +143,15 @@ public abstract class AbstractTest {
shell = bot.shell("New Project");
shell.activate();
bot.text().setText("C Project");
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "C/C++",
"C Project"));
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), "C/C++", "C Project"));
bot.button("Next >").click();
bot.textWithLabel("Project name:").setText(projectName);
bot.tree().expandNode("GNU Autotools")
.select("Hello World ANSI C Autotools Project");
bot.tree().expandNode("GNU Autotools").select("Hello World ANSI C Autotools Project");
bot.button("Finish").click();
bot.waitUntil(Conditions.shellCloses(shell));
IProjectNature nature = checkProject().getNature(
"org.eclipse.cdt.autotools.core.autotoolsNatureV2");
IProjectNature nature = checkProject().getNature("org.eclipse.cdt.autotools.core.autotoolsNatureV2");
assertNotNull(nature);
projectExplorer = bot.viewByTitle("Project Explorer");
@ -186,8 +180,7 @@ public abstract class AbstractTest {
* @param node
* The text of the node to select.
*/
public NodeAvailableAndSelect(SWTBotTree tree, String parent,
String node) {
public NodeAvailableAndSelect(SWTBotTree tree, String parent, String node) {
this.tree = tree;
this.node = node;
this.parent = parent;
@ -215,10 +208,8 @@ public abstract class AbstractTest {
*/
public static void enterProjectFolder() {
projectExplorer.setFocus();
projectExplorer.bot().tree().select(projectName).contextMenu("Go Into")
.click();
bot.waitUntil(waitForWidget(WidgetMatcherFactory.withText(projectName),
projectExplorer.getWidget()));
projectExplorer.bot().tree().select(projectName).contextMenu("Go Into").click();
bot.waitUntil(waitForWidget(WidgetMatcherFactory.withText(projectName), projectExplorer.getWidget()));
}
/**
@ -233,8 +224,7 @@ public abstract class AbstractTest {
// If the "Forward" button is not found, already at the top level.
return;
}
SWTBotToolbarButton backButton = projectExplorer
.toolbarPushButton("Back to Workspace");
SWTBotToolbarButton backButton = projectExplorer.toolbarPushButton("Back to Workspace");
if (backButton.isEnabled()) {
backButton.click();
bot.waitUntil(widgetIsEnabled(forwardButton));
@ -247,8 +237,7 @@ public abstract class AbstractTest {
* other radio button in the group that is already selected. Workaround for
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=344484
*/
public static void clickRadioButtonInGroup(String mnemonicText,
final String inGroup) {
public static void clickRadioButtonInGroup(String mnemonicText, final String inGroup) {
UIThreadRunnable.syncExec(() -> {
@SuppressWarnings("unchecked")
Matcher<Button> matcher = allOf(inGroup(inGroup), widgetOfType(Button.class),
@ -270,13 +259,11 @@ public abstract class AbstractTest {
bot.radioInGroup(mnemonicText, inGroup).click();
}
public static void clickContextMenu(AbstractSWTBot<? extends Control> bot,
String... texts) {
public static void clickContextMenu(AbstractSWTBot<? extends Control> bot, String... texts) {
new SWTBotMenu(ContextMenuHelper.contextMenu(bot, texts)).click();
}
public static void clickVolatileContextMenu(
AbstractSWTBot<? extends Control> bot, String... texts) {
public static void clickVolatileContextMenu(AbstractSWTBot<? extends Control> bot, String... texts) {
int tries = 0;
final int maxTries = 2;
while (true) {
@ -292,8 +279,7 @@ public abstract class AbstractTest {
}
public static void clickProjectContextMenu(String... texts) {
clickVolatileContextMenu(bot.viewByTitle("Project Explorer").bot()
.tree().select(projectName), texts);
clickVolatileContextMenu(bot.viewByTitle("Project Explorer").bot().tree().select(projectName), texts);
}
/**
@ -314,15 +300,12 @@ public abstract class AbstractTest {
menu.click();
}
public static SWTBotShell openProperties(String parentCategory,
String category) {
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Properties");
public static SWTBotShell openProperties(String parentCategory, String category) {
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Properties");
SWTBotShell shell = bot.shell("Properties for " + projectName);
shell.activate();
bot.text().setText(category);
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), parentCategory,
category));
bot.waitUntil(new NodeAvailableAndSelect(bot.tree(), parentCategory, category));
shell.activate();
return shell;
}
@ -340,10 +323,8 @@ public abstract class AbstractTest {
public static SWTBotView viewConsole(String consoleType) {
SWTBotView view = bot.viewByPartName("Console");
view.setFocus();
SWTBotToolbarDropDownButton b = view
.toolbarDropDownButton("Display Selected Console");
org.hamcrest.Matcher<MenuItem> withRegex = withRegex(".*" + consoleType
+ ".*");
SWTBotToolbarDropDownButton b = view.toolbarDropDownButton("Display Selected Console");
org.hamcrest.Matcher<MenuItem> withRegex = withRegex(".*" + consoleType + ".*");
focusMainShell();
b.menuItem(withRegex).click();
try {
@ -379,8 +360,7 @@ public abstract class AbstractTest {
for (final SWTBotShell shell : shells) {
if (!shell.equals(mainShell)) {
String shellTitle = shell.getText();
if (shellTitle.length() > 0
&& !shellTitle.startsWith("Quick Access")) {
if (shellTitle.length() > 0 && !shellTitle.startsWith("Quick Access")) {
UIThreadRunnable.syncExec(() -> {
if (shell.widget.getParent() != null && !shell.isOpen()) {
shell.close();

21
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
View file

@ -25,15 +25,14 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
/*
*
* TestToolActions.class,
* TestEnvironmentVars.class,
* TestMakeTargets.class,
* SetConfigurationParameter.class,
*/
AutoconfTests.class
})
/*
*
* TestToolActions.class,
* TestEnvironmentVars.class,
* TestMakeTargets.class,
* SetConfigurationParameter.class,
*/
AutoconfTests.class })
public class AutomatedIntegrationSuite {
// needed for this class to compile
@ -41,9 +40,7 @@ public class AutomatedIntegrationSuite {
public static void beforeClassMethod() {
// Verify that the necessary binaries are available, and if they are not,
// the tests will be ignored.
String[] testBinaryCommands = { "libtool --version",
"autoconf --version",
"automake --version" };
String[] testBinaryCommands = { "libtool --version", "autoconf --version", "automake --version" };
try {
for (String cmd : testBinaryCommands) {
Process process = ProcessFactory.getFactory().exec(cmd);

54
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java
View file

@ -62,8 +62,7 @@ public class SetConfigurationParameter extends AbstractTest {
// Set the configure parameters to be --enable-jeff via user-defined
// options
SWTBotShell shell = openProperties("Autotools", "Configure Settings");
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
SWTBotText text = bot.textWithLabel("Additional command-line options");
text.typeText("--enable-jeff");
bot.button("OK").click();
@ -71,8 +70,7 @@ public class SetConfigurationParameter extends AbstractTest {
// Create new build configurations that will be used throughout tests
projectExplorer.bot().tree().select(projectName);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Configurations", "Manage...");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
shell = bot.shell(projectName + ": Manage Configurations");
shell.activate();
bot.button("New...").click();
@ -80,8 +78,7 @@ public class SetConfigurationParameter extends AbstractTest {
shell.activate();
SWTBotText t = bot.textWithLabel("Name:");
t.setText("debug");
AbstractTest.clickRadioButtonInGroup("Existing configuration",
"Copy settings from");
AbstractTest.clickRadioButtonInGroup("Existing configuration", "Copy settings from");
bot.button("OK").click();
shell = bot.shell(projectName + ": Manage Configurations");
shell.activate();
@ -90,8 +87,7 @@ public class SetConfigurationParameter extends AbstractTest {
shell.activate();
t = bot.textWithLabel("Name:");
t.setText("default");
AbstractTest.clickRadioButtonInGroup("Default configuration",
"Copy settings from");
AbstractTest.clickRadioButtonInGroup("Default configuration", "Copy settings from");
bot.button("OK").click();
shell = bot.shell(projectName + ": Manage Configurations");
shell.activate();
@ -145,8 +141,7 @@ public class SetConfigurationParameter extends AbstractTest {
@Test
public void t2canBuildWithConfigParm() throws Exception {
projectExplorer.bot().tree().select(projectName);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
// Wait until the project is built
SWTBotShell shell = bot.shell("Build Project");
@ -192,8 +187,7 @@ public class SetConfigurationParameter extends AbstractTest {
String output = viewConsole("Configure").bot().styledText().getText();
// Verify we got some help output to the console
Pattern p = Pattern.compile(
".*WARNING:.*unrecognized.*--enable-jeff.*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*WARNING:.*unrecognized.*--enable-jeff.*", Pattern.DOTALL);
Matcher m = p.matcher(output);
assertTrue(m.matches());
@ -201,8 +195,7 @@ public class SetConfigurationParameter extends AbstractTest {
// Verifies fix for bug: #308261
long oldDate = f.lastModified();
projectExplorer.bot().tree().select(projectName);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
path = project.getLocation();
// We need to wait until the a.out file is created so
// sleep a bit and look for it...give up after 120 seconds
@ -225,8 +218,7 @@ public class SetConfigurationParameter extends AbstractTest {
@Test
public void t3newConfigCopiesParms() throws Exception {
projectExplorer.bot().tree().select(projectName);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Configurations", "Manage...");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
SWTBotShell shell = bot.shell(projectName + ": Manage Configurations");
shell.activate();
shell = bot.shell(projectName + ": Manage Configurations");
@ -248,8 +240,7 @@ public class SetConfigurationParameter extends AbstractTest {
}
}
assertTrue(configs.getText().contains("debug"));
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
SWTBotText text = bot.textWithLabel("Additional command-line options");
String val = text.getText();
assertEquals("--enable-jeff", val);
@ -266,16 +257,14 @@ public class SetConfigurationParameter extends AbstractTest {
bot.tree().expandNode("Autotools").select("Configure Settings");
configs = bot.comboBoxWithLabel("Configuration: ");
configs.setSelection("default");
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
text = bot.textWithLabel("Additional command-line options");
val = text.getText();
assertEquals("", val);
bot.button("OK").click();
// Build the project again and verify we get a build-debug directory
projectExplorer.bot().tree().select(projectName);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Project");
IWorkspace workspace = ResourcesPlugin.getWorkspace();
assertNotNull(workspace);
IWorkspaceRoot root = workspace.getRoot();
@ -362,8 +351,7 @@ public class SetConfigurationParameter extends AbstractTest {
}
assertEquals(2, foundUser);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Configurations", "Manage...");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Configurations", "Manage...");
shell = bot.shell(projectName + ": Manage Configurations");
shell.activate();
table = bot.table();
@ -392,15 +380,13 @@ public class SetConfigurationParameter extends AbstractTest {
SWTBotShell shell = bot.shell("Properties for " + projectName);
shell.activate();
configs = bot.comboBoxWithLabel("Configuration: ");
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
SWTBotText text = bot.textWithLabel("Additional command-line options");
String setting = text.getText();
assertEquals("--enable-jeff", setting);
configs.setFocus();
configs.setSelection("debug");
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
text = bot.textWithLabel("Additional command-line options");
setting = text.getText();
assertEquals("", setting);
@ -412,16 +398,14 @@ public class SetConfigurationParameter extends AbstractTest {
configs = bot.comboBoxWithLabel("Configuration: ");
configs.setSelection("debug");
assertTrue(configs.getText().contains("debug"));
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
text = bot.textWithLabel("Additional command-line options");
setting = text.getText();
assertEquals("--enable-jeff", setting);
configs.setFocus();
configs.setSelection("default");
assertTrue(configs.getText().contains("default"));
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
text = bot.textWithLabel("Additional command-line options");
setting = text.getText();
assertEquals("", setting);
@ -455,16 +439,14 @@ public class SetConfigurationParameter extends AbstractTest {
configs = bot.comboBoxWithLabel("Configuration: ");
assertTrue(configs.getText().contains("release"));
assertTrue(configs.getText().contains("Active"));
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
SWTBotText text = bot.textWithLabel("Additional command-line options");
String setting = text.getText();
assertEquals("--enable-jeff", setting);
configs.setFocus();
configs.setSelection("debug");
assertTrue(configs.getText().contains("debug"));
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
text = bot.textWithLabel("Additional command-line options");
setting = text.getText();
assertEquals("", setting);

21
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java
View file

@ -45,15 +45,13 @@ public class TestEnvironmentVars extends AbstractTest {
SWTBotShell shell = openProperties("Autotools", "Configure Settings");
// Set the configure parameters to be --enable-jeff via user-defined
// options
bot.treeWithLabel("Configure Settings").expandNode("configure")
.select("Advanced");
bot.treeWithLabel("Configure Settings").expandNode("configure").select("Advanced");
SWTBotText text = bot.textWithLabel("Additional command-line options");
text.typeText("${some_var}");
bot.button("OK").click();
bot.waitUntil(Conditions.shellCloses(shell), 120000);
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Reconfigure Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
IPath path = checkProject().getLocation();
File f = null;
// We need to wait until the config.status file is created so
@ -96,8 +94,7 @@ public class TestEnvironmentVars extends AbstractTest {
shell.activate();
bot.button("OK").click();
bot.waitUntil(Conditions.shellCloses(shell));
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Reconfigure Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
IPath path = checkProject().getLocation();
File f = null;
@ -148,20 +145,16 @@ public class TestEnvironmentVars extends AbstractTest {
bot.textWithLabel("Command").setText("");
// Choose three different forms, some using quotes to allow blanks in
// them
bot.textWithLabel("Command")
.typeText(
"some_var1=\"a boat\" some_var2='a train' some_var3=car fake_configure some_var4=\"a wagon\" some_var5='a plane' some_var6=skates");
bot.textWithLabel("Command").typeText(
"some_var1=\"a boat\" some_var2='a train' some_var3=car fake_configure some_var4=\"a wagon\" some_var5='a plane' some_var6=skates");
bot.button("OK").click();
// Reconfigure the project and make sure the env variables are seen in
// the script
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Reconfigure Project");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Reconfigure Project");
focusMainShell();
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
Pattern p = Pattern.compile(
".*a boat.*a train.*car.*a wagon.*a plane.*skates.*",
Pattern.DOTALL);
Pattern p = Pattern.compile(".*a boat.*a train.*car.*a wagon.*a plane.*skates.*", Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
}

6
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java
View file

@ -60,8 +60,7 @@ public class TestMakeTargets extends AbstractTest {
assertTrue(f.exists());
projectExplorer.bot().tree().getTreeItem(projectName).select();
clickContextMenu(projectExplorer.bot().tree().select(projectName),
"Build Targets", "Build...");
clickContextMenu(projectExplorer.bot().tree().select(projectName), "Build Targets", "Build...");
shell = bot.shell("Build Targets");
shell.activate();
bot.table().getTableItem("info").select();
@ -79,8 +78,7 @@ public class TestMakeTargets extends AbstractTest {
bot.button("Build").click();
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
p = Pattern.compile(".*make check.*Making check in src.*",
Pattern.DOTALL);
p = Pattern.compile(".*make check.*Making check in src.*", Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
}

65
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java
View file

@ -71,8 +71,8 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+ ".*aclocal --help.*Usage: aclocal.*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*aclocal --help.*Usage: aclocal.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// Verify we still don't have an aclocal.m4 file yet
f = new File(path.toOSString());
@ -85,8 +85,7 @@ public class TestToolActions extends AbstractTest {
bot.button("OK").click();
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+ ".*aclocal.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*aclocal.*", Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// We need to wait until the aclocal.m4 file is created so
// sleep a bit and look for it...give up after 20 seconds
@ -115,8 +114,7 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking autoconf in.*" + projectName
+ ".*autoconf.*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*Invoking autoconf in.*" + projectName + ".*autoconf.*", Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// We need to wait until the configure file is created so
// sleep a bit and look for it...give up after 20 seconds
@ -134,13 +132,11 @@ public class TestToolActions extends AbstractTest {
// explorer menu directly from the configure.ac file.
assertTrue(f.delete());
enterProjectFolder();
clickVolatileContextMenu(
projectExplorer.bot().tree().select("configure.ac"),
"Invoke Autotools", "Invoke Autoconf");
clickVolatileContextMenu(projectExplorer.bot().tree().select("configure.ac"), "Invoke Autotools",
"Invoke Autoconf");
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
p = Pattern.compile(".*Invoking autoconf in.*" + projectName
+ ".*autoconf.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking autoconf in.*" + projectName + ".*autoconf.*", Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// We need to wait until the configure file is created so
// sleep a bit and look for it...give up after 20 seconds
@ -181,8 +177,8 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking automake in.*" + projectName
+ ".*automake --help.*Usage:.*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*Invoking automake in.*" + projectName + ".*automake --help.*Usage:.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// Verify we still don't have Makefile.in files yet
f = new File(path.toOSString());
@ -201,8 +197,8 @@ public class TestToolActions extends AbstractTest {
bot.button("OK").click();
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
p = Pattern.compile(".*Invoking automake in.*" + projectName
+ ".*automake --add-missing Makefile src/Makefile.*",
p = Pattern.compile(
".*Invoking automake in.*" + projectName + ".*automake --add-missing Makefile src/Makefile.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
// We need to wait until the Makefile.in files are created so
@ -234,8 +230,9 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking libtoolize in.*" + projectName
+ ".*libtoolize --help.*Usage: .*libtoolize.*", Pattern.DOTALL);
Pattern p = Pattern.compile(
".*Invoking libtoolize in.*" + projectName + ".*libtoolize --help.*Usage: .*libtoolize.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
}
@ -250,8 +247,9 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking autoheader in.*" + projectName
+ ".*autoheader --help.*Usage:.*autoheader.*", Pattern.DOTALL);
Pattern p = Pattern.compile(
".*Invoking autoheader in.*" + projectName + ".*autoheader --help.*Usage:.*autoheader.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
}
@ -288,8 +286,9 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking autoreconf in.*" + projectName
+ ".*autoreconf --help.*Usage: .*autoreconf.*", Pattern.DOTALL);
Pattern p = Pattern.compile(
".*Invoking autoreconf in.*" + projectName + ".*autoreconf --help.*Usage: .*autoreconf.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
clickProjectContextMenu("Invoke Autotools", "Invoke Autoreconf");
shell = bot.shell("Autoreconf Options");
@ -299,14 +298,14 @@ public class TestToolActions extends AbstractTest {
// We need to wait until the Makefile.in file is created so
// sleep a bit and look for it
bot.sleep(5000);
// Verify a number of generated files now exist
String[] fileList = { "Makefile.in", "src/Makefile.in", "configure", "config.sub" };
for (String name : fileList) {
f = new File(path.append(name).toOSString());
assertTrue("Missing: " + name, f.exists());
}
String name = "config.status";
f = new File(path.append(name).toOSString());
assertTrue("Mistakenly found: " + name, !f.exists()); // shouldn't have run configure
@ -434,8 +433,8 @@ public class TestToolActions extends AbstractTest {
SWTBotView consoleView = viewConsole("Autotools");
consoleView.setFocus();
// Verify we got some help output to the console
Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName
+ ".*automake --help.*Usage:.*automake.*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*Invoking aclocal in.*" + projectName + ".*automake --help.*Usage:.*automake.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
clickProjectContextMenu("Invoke Autotools", "Invoke Automake");
@ -446,8 +445,8 @@ public class TestToolActions extends AbstractTest {
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
p = Pattern.compile(".*Invoking automake in.*" + projectName
+ ".*autoconf --help.*Usage:.*autoconf.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking automake in.*" + projectName + ".*autoconf --help.*Usage:.*autoconf.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
clickProjectContextMenu("Invoke Autotools", "Invoke Autoheader");
@ -458,8 +457,8 @@ public class TestToolActions extends AbstractTest {
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
p = Pattern.compile(".*Invoking autoheader in.*" + projectName
+ ".*autoreconf --help.*Usage:.*autoreconf.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking autoheader in.*" + projectName + ".*autoreconf --help.*Usage:.*autoreconf.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
clickProjectContextMenu("Invoke Autotools", "Invoke Autoreconf");
@ -470,8 +469,8 @@ public class TestToolActions extends AbstractTest {
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
p = Pattern.compile(".*Invoking autoreconf in.*" + projectName
+ ".*libtoolize --help.*Usage:.*libtoolize.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking autoreconf in.*" + projectName + ".*libtoolize --help.*Usage:.*libtoolize.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
clickProjectContextMenu("Invoke Autotools", "Invoke Libtoolize");
@ -482,8 +481,8 @@ public class TestToolActions extends AbstractTest {
consoleView = bot.viewByPartName("Console");
consoleView.setFocus();
// Verify we got some help output to the console
p = Pattern.compile(".*Invoking libtoolize in.*" + projectName
+ ".*aclocal --help.*Usage:.*aclocal.*", Pattern.DOTALL);
p = Pattern.compile(".*Invoking libtoolize in.*" + projectName + ".*aclocal --help.*Usage:.*aclocal.*",
Pattern.DOTALL);
bot.waitUntil(consoleTextMatches(consoleView, p));
}

6
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java
View file

@ -17,11 +17,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
TestMacroParser.class,
TestTokenizer.class,
TestShellParser.class
})
@Suite.SuiteClasses({ TestMacroParser.class, TestTokenizer.class, TestShellParser.class })
public class AutoconfTests {
}

47
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
View file

@ -49,9 +49,9 @@ public abstract class BaseParserTest {
assertNotNull(exception);
errors.add(exception);
};
this.macroDetector = new AutoconfMacroDetector();
macroNames = new HashSet<>();
this.macroValidator = (AutoconfMacroElement element) -> {
assertNotNull(element);
@ -83,14 +83,14 @@ public abstract class BaseParserTest {
* cleared out before use
* @param parser
* @param document
* @return root
* @return root
*/
protected AutoconfElement parseWithHandlers(IDocument document) {
AutoconfParser parser = new AutoconfParser(errorHandler, macroDetector, macroValidator);
errors.clear();
macroNames.clear();
AutoconfElement root = parser.parse(document);
assertNotNull(root);
return root;
@ -100,7 +100,7 @@ public abstract class BaseParserTest {
* Parse the document in 'string' twice, once without any handlers and once with the standard error or macro handlers,
* cleared out before use
* @param string
* @return root
* @return root
*/
protected AutoconfElement parse(String string) {
AutoconfElement tree = parse(string, false);
@ -113,34 +113,33 @@ public abstract class BaseParserTest {
assertNotNull(root1);
AutoconfElement root2 = parseWithHandlers(document);
assertNotNull(root2);
validateSourceTree(root1);
validateSourceTree(root2);
// TODO: check root1 == root2
// ensure the doc wasn't changed (sanity)
assertEquals(string, document.get());
if (!allowErrors) {
if (!errors.isEmpty())
fail("got errors" + errors.get(0));
}
else
} else
assertFalse(errors.isEmpty());
return root2;
}
protected void checkError(String msgKey) {
for (ParseException exc: errors) {
for (ParseException exc : errors) {
if (exc.getMessage().contains(msgKey))
return;
}
String any = "";
if (!errors.isEmpty())
any = ", but saw " + errors.get(0).toString();
fail("did not find error: " + msgKey + any );
fail("did not find error: " + msgKey + any);
}
protected void checkError(String msgKey, int line) {
@ -160,7 +159,8 @@ public abstract class BaseParserTest {
if (possible == null)
fail("did not find any error: " + msgKey);
else
fail("did not find error: " + msgKey + " on line: " + line +", but found one at " + possible.getLineNumber());
fail("did not find error: " + msgKey + " on line: " + line + ", but found one at "
+ possible.getLineNumber());
}
/**
@ -176,8 +176,7 @@ public abstract class BaseParserTest {
validateSourceElement(element);
AutoconfElement[] kids = element.getChildren();
for (int i = 0; i < kids.length; i++) {
if (kids[i].getStartOffset() < element.getStartOffset()
|| kids[i].getEndOffset() > element.getEndOffset())
if (kids[i].getStartOffset() < element.getStartOffset() || kids[i].getEndOffset() > element.getEndOffset())
fail(describeElement(kids[i]) + " not inside parent " + describeElement(element));
validateSourceTree(kids[i]);
}
@ -226,16 +225,16 @@ public abstract class BaseParserTest {
assertEquals(elements.length, assertTreeStructure(tree, elements, 0));
}
private int assertTreeStructure(AutoconfElement tree, String[] elements,
int elementIdx) {
private int assertTreeStructure(AutoconfElement tree, String[] elements, int elementIdx) {
AutoconfElement[] kids = tree.getChildren();
for (int j = 0; j < kids.length; j++) {
if (elementIdx >= elements.length || elements[elementIdx] == null) {
if (elementIdx >= elements.length || elements[elementIdx] == null) {
fail("extra children in " + tree + " at " + kids[j]);
}
if (!kids[j].getName().equals(elements[elementIdx]))
fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName() + "=" + kids[j].getName());
if (!kids[j].getName().equals(elements[elementIdx]))
fail("did not match " + elements[elementIdx] + ", instead got " + kids[j].getClass().getSimpleName()
+ "=" + kids[j].getName());
elementIdx++;
if (kids[j].getChildren().length > 0) {
elementIdx = assertTreeStructure(kids[j], elements, elementIdx);

141
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestMacroParser.java
View file

@ -25,7 +25,6 @@ import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfMacroElement;
import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfParser;
import org.junit.Test;
/**
* Test parsing with macros
* @author eswartz
@ -37,114 +36,103 @@ public class TestMacroParser extends BaseParserTest {
public void testEmpty() {
parse("");
}
@Test
public void testComments() {
//
String text =
"dnl first line\n" +
"dnl second line\n";
//
String text = "dnl first line\n" + "dnl second line\n";
AutoconfElement root = parse(text);
Object[] kids = root.getChildren();
// these are stripped
assertEquals(0, kids.length);
assertTreeStructure(root, new String[] {});
}
@Test
public void testMacroParsing1() {
//
String text =
"AC_REQUIRE([AM_SANITY_CHECK])\n" +
"";
//
String text = "AC_REQUIRE([AM_SANITY_CHECK])\n" + "";
AutoconfElement root = parse(text);
assertTreeStructure(root, new String[] { "AC_REQUIRE", "AM_SANITY_CHECK", null });
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
assertTrue(kids[0] instanceof AutoconfMacroElement);
AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
assertEquals("AC_REQUIRE", macro.getName());
assertEquals(1, macro.getParameterCount());
AutoconfElement[] args = macro.getChildren();
assertEquals(1, args.length);
assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
assertEquals("AM_SANITY_CHECK", ((AutoconfMacroArgumentElement)args[0]).getName());
assertEquals("AM_SANITY_CHECK", ((AutoconfMacroArgumentElement) args[0]).getName());
assertEquals("AM_SANITY_CHECK", macro.getParameter(0));
// keep quotes in source
assertEqualSource("[AM_SANITY_CHECK]", args[0]);
assertEqualSource("AC_REQUIRE([AM_SANITY_CHECK])", macro);
}
@Test
public void testMacroParsing2() {
//
String text =
"AC_TWO_ARGS(first,second)\n" +
"";
//
String text = "AC_TWO_ARGS(first,second)\n" + "";
AutoconfElement root = parse(text);
assertTreeStructure(root, new String[] { "AC_TWO_ARGS", "first", "second", null });
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
assertTrue(kids[0] instanceof AutoconfMacroElement);
AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
assertEquals("AC_TWO_ARGS", macro.getName());
assertEquals(2, macro.getParameterCount());
AutoconfElement[] args = macro.getChildren();
assertEquals(2, args.length);
assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
assertEquals("first", ((AutoconfMacroArgumentElement)args[0]).getName());
assertEquals("first", ((AutoconfMacroArgumentElement) args[0]).getName());
assertTrue(args[1] instanceof AutoconfMacroArgumentElement);
assertEquals("second", ((AutoconfMacroArgumentElement)args[1]).getName());
assertEquals("second", ((AutoconfMacroArgumentElement) args[1]).getName());
assertEquals("first", macro.getParameter(0));
assertEquals("second", macro.getParameter(1));
assertEqualSource("first", args[0]);
assertEqualSource("second", args[1]);
assertEqualSource("AC_TWO_ARGS(first,second)", macro);
}
@Test
public void testMacroParsing3() {
//
String text =
"AC_ONE_ARG( [quoted( arg ), second] )\n" +
"";
//
String text = "AC_ONE_ARG( [quoted( arg ), second] )\n" + "";
AutoconfElement root = parse(text);
assertTreeStructure(root, new String[] { "AC_ONE_ARG", "quoted( arg ), second", null });
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
assertTrue(kids[0] instanceof AutoconfMacroElement);
AutoconfMacroElement macro = (AutoconfMacroElement) kids[0];
assertEquals("AC_ONE_ARG", macro.getName());
AutoconfElement[] args = macro.getChildren();
assertEquals(1, macro.getParameterCount());
assertEquals(1, args.length);
assertTrue(args[0] instanceof AutoconfMacroArgumentElement);
// spaces removed from outermost arguments, but not inner
assertEquals("quoted( arg ), second", ((AutoconfMacroArgumentElement)args[0]).getName());
assertEquals("quoted( arg ), second", ((AutoconfMacroArgumentElement) args[0]).getName());
assertEquals("quoted( arg ), second", macro.getParameter(0));
assertEqualSource("[quoted( arg ), second]", args[0]);
assertEqualSource("AC_ONE_ARG( [quoted( arg ), second] )", macro);
}
@Test
public void testMacroParsing4() {
//
String text =
"AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n" +
" [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" +
"\r\n" +
"";
//
String text = "AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\r\n"
+ " [AM_AUTOMAKE_VERSION([1.4-p6])])\r\n" + "\r\n" + "";
AutoconfElement root = parse(text);
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
@ -156,7 +144,7 @@ public class TestMacroParser extends BaseParserTest {
assertEquals(2, macro.getParameterCount());
assertEquals("AM_SET_CURRENT_AUTOMAKE_VERSION", macro.getParameter(0));
assertEquals("AM_AUTOMAKE_VERSION([1.4-p6])", macro.getParameter(1));
// no spaces in source either, but quotes kept
assertEqualSource("[AM_SET_CURRENT_AUTOMAKE_VERSION]", macro.getChildren()[0]);
assertEqualSource("[AM_AUTOMAKE_VERSION([1.4-p6])]", macro.getChildren()[1]);
@ -166,30 +154,15 @@ public class TestMacroParser extends BaseParserTest {
public void testMacroParsing5() {
// check that complex shell constructs don't throw off the
// parser, and also that we don't mistake shell tokens in a macro argument
String arg2 =
"AC_MSG_CHECKING(for working $2)\n" +
"# Run test in a subshell; some versions of sh will print an error if\n" +
"# an executable is not found, even if stderr is redirected.\n" +
"# Redirect stdin to placate older versions of autoconf. Sigh.\n" +
"if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" +
" $1=$2\n" +
" AC_MSG_RESULT(found)\n" +
"else\n" +
" $1=\"$3/missing $2\"\n" +
" AC_MSG_RESULT(missing)\n" +
"fi\n" +
"AC_SUBST($1)";
String text =
"AC_DEFUN([AM_MISSING_PROG],\n" +
"[" + arg2 + "])\n" +
"";
String arg2 = "AC_MSG_CHECKING(for working $2)\n"
+ "# Run test in a subshell; some versions of sh will print an error if\n"
+ "# an executable is not found, even if stderr is redirected.\n"
+ "# Redirect stdin to placate older versions of autoconf. Sigh.\n"
+ "if ($2 --version) < /dev/null > /dev/null 2>&1; then\n" + " $1=$2\n" + " AC_MSG_RESULT(found)\n"
+ "else\n" + " $1=\"$3/missing $2\"\n" + " AC_MSG_RESULT(missing)\n" + "fi\n" + "AC_SUBST($1)";
String text = "AC_DEFUN([AM_MISSING_PROG],\n" + "[" + arg2 + "])\n" + "";
AutoconfElement root = parse(text);
assertTreeStructure(root, new String[] {
"AC_DEFUN",
"AM_MISSING_PROG",
arg2,
null,
});
assertTreeStructure(root, new String[] { "AC_DEFUN", "AM_MISSING_PROG", arg2, null, });
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
assertTrue(kids[0] instanceof AutoconfMacroElement);
@ -200,19 +173,17 @@ public class TestMacroParser extends BaseParserTest {
// spaces dropped
assertEquals(2, macro.getParameterCount());
assertEquals("AM_MISSING_PROG", macro.getParameter(0));
// be sure complex arguments aren't mangled
assertEquals(arg2, macro.getParameter(1));
assertEqualSource("[" + arg2 + "]", macro.getChildren()[1]);
}
@Test
public void testMacroParsing6() {
// empty arguments
String text =
"AC_DEFUN( ,\n" +
")\n";
String text = "AC_DEFUN( ,\n" + ")\n";
AutoconfElement root = parse(text);
AutoconfElement[] kids = root.getChildren();
assertEquals(1, kids.length);
@ -232,34 +203,29 @@ public class TestMacroParser extends BaseParserTest {
@Test
public void testWithErrorUnmatchedLeftParen() {
String text =
"AC_BAD_MACRO(\n";
String text = "AC_BAD_MACRO(\n";
AutoconfElement root = parse(text, true);
assertEquals(1, root.getChildren().length);
assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_LEFT_PARENTHESIS));
}
@Test
public void testWithErrorUnmatchedRightParen() {
String text =
"AC_BAD_MACRO())\n";
String text = "AC_BAD_MACRO())\n";
AutoconfElement root = parse(text, true);
assertEquals(1, root.getChildren().length);
assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
checkError(AutoconfEditorMessages.getString(AutoconfParser.UNMATCHED_RIGHT_PARENTHESIS));
}
@Test
public void testNoFalseUnmatchedRightParen() {
String text =
"AC_BAD_MACRO()\n" +
"(\n"+
"cd foo;\n"+
"if test -f myfile; then exit 1; fi\n"+
")\n";
// nothing but the macro and 'if' is detected as meaningful
String text = "AC_BAD_MACRO()\n" + "(\n" + "cd foo;\n" + "if test -f myfile; then exit 1; fi\n" + ")\n";
// nothing but the macro and 'if' is detected as meaningful
AutoconfElement root = parse(text);
assertEquals(2, root.getChildren().length);
assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);
@ -268,9 +234,8 @@ public class TestMacroParser extends BaseParserTest {
@Test
public void testNestedMacro() {
String text =
"AC_1(AC_2())\n";
String text = "AC_1(AC_2())\n";
AutoconfElement root = parse(text);
assertEquals(1, root.getChildren().length);
assertTrue(root.getChildren()[0] instanceof AutoconfMacroElement);

327
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestShellParser.java
View file

@ -32,249 +32,183 @@ public class TestShellParser extends BaseParserTest {
@Test
public void testHERE() {
String HERE_TEXT =
"\n"+
"while true; do \n"+
"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
"done\n";
String text = "cat <<EOF"+
HERE_TEXT +
"EOF\n" +
"blah";
AutoconfElement tree = parse(text);
// only see a macro call, not a loop
assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
}
@Test
public void testHERE2() {
String HERE_TEXT =
"\n"+
"while true; do \n"+
"AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n"+
"done\n";
String text = "cat <<-EOF"+
HERE_TEXT +
"EOF\n" +
"blah";
String HERE_TEXT = "\n" + "while true; do \n" + "AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n" + "done\n";
String text = "cat <<EOF" + HERE_TEXT + "EOF\n" + "blah";
AutoconfElement tree = parse(text);
// only see a macro call, not a loop
assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
}
@Test
public void testHERE2() {
String HERE_TEXT = "\n" + "while true; do \n" + "AM_INIT_AUTOMAKE([confusion], [$2], EOF)\n" + "done\n";
String text = "cat <<-EOF" + HERE_TEXT + "EOF\n" + "blah";
AutoconfElement tree = parse(text);
// only see a macro call, not a loop
assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "confusion", "$2", "EOF", null });
}
@Test
public void testIf0() {
String text = "# comment\n"+
"\tif true; then\n" +
"\t\tfoo;\n"+
"\tfi\n";
String text = "# comment\n" + "\tif true; then\n" + "\t\tfoo;\n" + "\tfi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIf1() {
String text = "# comment\n"+
"\tif true; then\n" +
"\t\tAC_SOMETHING();\n"+
"\tfi\n";
String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_SOMETHING();\n" + "\tfi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "if", "AC_SOMETHING", "", null, null });
}
@Test
public void testIfElse0() {
String text = "# comment\n"+
"\tif true; then\n" +
"\t\tfoo;\n"+
"\telse\n"+
"\t\tbar;\n"+
"\tfi\n";
String text = "# comment\n" + "\tif true; then\n" + "\t\tfoo;\n" + "\telse\n" + "\t\tbar;\n" + "\tfi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "if", "else", null });
}
@Test
public void testIfElse1() {
String text = "# comment\n"+
"\tif true; then\n" +
"\t\tAC_ONE(...);\n"+
"\telse\n"+
"\t\tAC_TWO(AC_THREE());\n"+
"\tfi\n";
String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_ONE(...);\n" + "\telse\n"
+ "\t\tAC_TWO(AC_THREE());\n" + "\tfi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] {
"if",
"AC_ONE",
"...",
null,
"else",
"AC_TWO",
"AC_THREE",
"AC_THREE",
"",
null,
null,
null,
null,
null});
assertTreeStructure(tree, new String[] { "if", "AC_ONE", "...", null, "else", "AC_TWO", "AC_THREE", "AC_THREE",
"", null, null, null, null, null });
AutoconfElement[] kids = tree.getChildren();
assertEqualSource("AC_ONE(...)", kids[0].getChildren()[0]);
assertEqualSource("AC_TWO(AC_THREE())", kids[0].getChildren()[1].getChildren()[0]);
}
@Test
public void testIf2() {
String text =
"if blah\n" +
"then fi\n";
String text = "if blah\n" + "then fi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIfElif() {
String text = "# comment\n"+
"\tif true; then\n" +
"\t\tAC_ONE(...);\n"+
"\telif false; then \n"+
"\t\tAC_TWO(...);\n"+
"\tfi\n";
String text = "# comment\n" + "\tif true; then\n" + "\t\tAC_ONE(...);\n" + "\telif false; then \n"
+ "\t\tAC_TWO(...);\n" + "\tfi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] {
"if",
"AC_ONE",
"...",
null,
"elif",
"AC_TWO",
"...",
null,
null,
null });
assertTreeStructure(tree,
new String[] { "if", "AC_ONE", "...", null, "elif", "AC_TWO", "...", null, null, null });
}
@Test
public void testIfErr1() {
String text =
"if then fi\n";
String text = "if then fi\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_SPECIFIER, "then"));
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIfErr2() {
String text =
"if true; do fi\n";
String text = "if true; do fi\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_DO));
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIfErr3() {
String text =
"if; else bar; fi\n";
String text = "if; else bar; fi\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "then"));
assertTreeStructure(tree, new String[] { "if", "else", null });
}
@Test
public void testIfErr4() {
String text =
"if true; then stmt fi\n";
String text = "if true; then stmt fi\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "fi"));
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIfErr5() {
String text =
"if true; then\n";
String text = "if true; then\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
assertTreeStructure(tree, new String[] { "if" });
}
@Test
public void testIfErr6() {
String text =
"if true; then foo; else\n";
String text = "if true; then foo; else\n";
AutoconfElement tree = parse(text, true);
assertEquals(2, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "if"));
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "else"));
assertTreeStructure(tree, new String[] { "if", "else", null });
}
@Test
public void testWhile() {
String text =
"while true; do foo; done\n";
String text = "while true; do foo; done\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "while" });
}
@Test
public void testWhile2() {
String text =
"while true\n" +
"do\n"+
"AC_SOMETHING(...); done\n";
String text = "while true\n" + "do\n" + "AC_SOMETHING(...); done\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
}
@Test
public void testWhileErr() {
String text =
"while; AC_SOMETHING(...) done\n";
String text = "while; AC_SOMETHING(...) done\n";
AutoconfElement tree = parse(text, true);
assertEquals(2, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.MISSING_SPECIFIER, "do"));
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "done"));
assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
}
@Test
public void testWhileErr2() {
String text =
"while true; do AC_SOMETHING(...)\n";
String text = "while true; do AC_SOMETHING(...)\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "while"));
assertTreeStructure(tree, new String[] { "while", "AC_SOMETHING", "...", null, null });
}
@Test
public void testCase() {
String text =
"case $VAL in\n"+
"linux-*-*) AC_FIRST($VAL) ; true ;;\n"+
"bsd-* | macosx-*) : ;;\n"+
"*) echo \"I dunno $VAL\";;\n"+
"esac\n";
String text = "case $VAL in\n" + "linux-*-*) AC_FIRST($VAL) ; true ;;\n" + "bsd-* | macosx-*) : ;;\n"
+ "*) echo \"I dunno $VAL\";;\n" + "esac\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] {
"case",
"linux-*-*",
"AC_FIRST",
"$VAL",
null,
null,
"bsd-* | macosx-*",
"*",
null
});
assertTreeStructure(tree,
new String[] { "case", "linux-*-*", "AC_FIRST", "$VAL", null, null, "bsd-* | macosx-*", "*", null });
AutoconfElement[] kids = tree.getChildren();
assertEquals(1, kids.length);
assertTrue(kids[0] instanceof AutoconfCaseElement);
AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
assertEqualSource(text.substring(0, text.length()-1), caseEl);
assertEqualSource(text.substring(0, text.length() - 1), caseEl);
assertEquals(3, caseEl.getChildren().length);
assertTrue(caseEl.getChildren()[0] instanceof AutoconfCaseConditionElement);
assertTrue(caseEl.getChildren()[1] instanceof AutoconfCaseConditionElement);
assertTrue(caseEl.getChildren()[2] instanceof AutoconfCaseConditionElement);
AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
assertEquals("linux-*-*) AC_FIRST($VAL) ; true ;;", caseCond.getSource());
assertEquals(1, caseCond.getChildren().length);
@ -287,19 +221,19 @@ public class TestShellParser extends BaseParserTest {
caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[2];
assertEquals("*) echo \"I dunno $VAL\";;", caseCond.getSource());
assertEquals(0, caseCond.getChildren().length);
}
@Test
public void testCaseErr() {
String text =
"case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
String text = "case $VAL; linux-*-*) AC_FIRST($VAL) ; true esac\n";
AutoconfElement tree = parse(text, true);
assertEquals(2, errors.size());
checkError(AutoconfEditorMessages.getString(AutoconfParser.INVALID_IN));
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.INVALID_TERMINATION, "esac"));
assertTreeStructure(tree, new String[] { "case", "linux-*-*", "AC_FIRST", "$VAL", null, null, null });
AutoconfElement[] kids = tree.getChildren();
AutoconfCaseElement caseEl = (AutoconfCaseElement) kids[0];
AutoconfCaseConditionElement caseCond = (AutoconfCaseConditionElement) caseEl.getChildren()[0];
@ -308,148 +242,95 @@ public class TestShellParser extends BaseParserTest {
assertEqualSource("AC_FIRST($VAL)", caseCond.getChildren()[0]);
}
@Test
public void testCaseErr2() {
String text =
"case $VAL in\n";
String text = "case $VAL in\n";
AutoconfElement tree = parse(text, true);
assertEquals(1, errors.size());
checkError(AutoconfEditorMessages.getFormattedString(AutoconfParser.UNTERMINATED_CONSTRUCT, "case"));
assertTreeStructure(tree, new String[] { "case" });
}
@Test
public void testForIn() {
// don't get upset by 'in'
String text =
"for VAL in 1 2 3 4; do echo $VAL; done\n";
String text = "for VAL in 1 2 3 4; do echo $VAL; done\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] { "for" });
AutoconfElement[] kids = tree.getChildren();
AutoconfElement forEl = kids[0];
assertEqualSource(text.substring(0, text.length()-1), forEl);
assertEqualSource(text.substring(0, text.length() - 1), forEl);
}
@Test
public void testForDo() {
// don't get upset by parentheses
String text =
"for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
String text = "for (( AC_1; AC_2(); AC_3(...) )); do echo $VAL; done\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] { "for", "AC_1", "AC_2", "", null, "AC_3", "...", null, null });
}
@Test
public void testUntil() {
String text =
"until false; do AC_SOMETHING(...); done\n";
String text = "until false; do AC_SOMETHING(...); done\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] { "until", "AC_SOMETHING", "...", null, null });
}
@Test
public void testSelect() {
String text =
"select VAR in 1 2 3; do AC_SOMETHING(...); done\n"+
"select VAR; do AC_SOMETHING; done\n";
String text = "select VAR in 1 2 3; do AC_SOMETHING(...); done\n" + "select VAR; do AC_SOMETHING; done\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] {
"select",
"AC_SOMETHING",
"...",
null,
null,
"select",
"AC_SOMETHING",
null
});
assertTreeStructure(tree,
new String[] { "select", "AC_SOMETHING", "...", null, null, "select", "AC_SOMETHING", null });
}
@Test
public void testComplex1() {
String text =
"AM_INIT_AUTOMAKE([foo1], 1.96)\n" +
"while true; do \n" +
" var=shift;\n" +
" if [ test -f \"$var\"] ; then\n"+
" AC_SOMETHING($var);\n"+
" fi\n"+
"done;\n"+
"AM_GENERATE(Makefile)\n";
String text = "AM_INIT_AUTOMAKE([foo1], 1.96)\n" + "while true; do \n" + " var=shift;\n"
+ " if [ test -f \"$var\"] ; then\n" + " AC_SOMETHING($var);\n" + " fi\n" + "done;\n"
+ "AM_GENERATE(Makefile)\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] {
"AM_INIT_AUTOMAKE",
"foo1",
"1.96",
null,
"while",
"if",
"AC_SOMETHING",
"$var",
null,
null,
null,
"AM_GENERATE",
"Makefile",
null
});
assertTreeStructure(tree, new String[] { "AM_INIT_AUTOMAKE", "foo1", "1.96", null, "while", "if",
"AC_SOMETHING", "$var", null, null, null, "AM_GENERATE", "Makefile", null });
}
@Test
public void testComplex2() {
String text =
"if true; then\n" +
"AC_CANONICAL_HOST\n" +
"else\n" +
"case foo in \n" +
" 3) 1 ;;\n" +
"esac;\n" +
"fi\n";
String text = "if true; then\n" + "AC_CANONICAL_HOST\n" + "else\n" + "case foo in \n" + " 3) 1 ;;\n"
+ "esac;\n" + "fi\n";
AutoconfElement tree = parse(text, false);
assertTreeStructure(tree, new String[] {
"if",
"AC_CANONICAL_HOST",
"else",
"case",
"3",
null,
null,
null
});
assertTreeStructure(tree, new String[] { "if", "AC_CANONICAL_HOST", "else", "case", "3", null, null, null });
}
@Test
public void testEarlyClose() {
String text =
"if true; then foo ; fi\n"+
"fi\n"+
"while true; do done;\n";
String text = "if true; then foo ; fi\n" + "fi\n" + "while true; do done;\n";
AutoconfElement tree = parse(text, true);
assertTreeStructure(tree, new String[] {
"if",
"while"
});
assertTreeStructure(tree, new String[] { "if", "while" });
}
@Test
public void testOverlapping() {
String text =
"for foo\n"+
"if bar\n";
String text = "for foo\n" + "if bar\n";
AutoconfElement tree = parse(text, true);
assertTreeStructure(tree, new String[] {
"for",
"if"
});
assertTreeStructure(tree, new String[] { "for", "if" });
}
@Test
public void testDollar() {
// dollars guard keywords
String text =
"if [ $if == 3 ] ; then $for; fi\n";
String text = "if [ $if == 3 ] ; then $for; fi\n";
AutoconfElement tree = parse(text);
assertTreeStructure(tree, new String[] {
"if"
});
assertTreeStructure(tree, new String[] { "if" });
}
}

130
build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
View file

@ -30,7 +30,6 @@ import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
import org.junit.Test;
/**
* Test autoconf tokenizer. The tokenizer mainly is used to detect boundaries and keywords
* and is not a full shell tokenizer.
@ -51,7 +50,7 @@ public class TestTokenizer {
tokenizerErrors.add(exception);
});
tokenizer.setM4Context(isM4Mode);
return tokenize(tokenizer);
}
@ -69,6 +68,7 @@ public class TestTokenizer {
protected void checkNoErrors() {
assertEquals(0, tokenizerErrors.size());
}
@Test
public void testEmpty() {
IDocument document = createDocument("");
@ -76,6 +76,7 @@ public class TestTokenizer {
checkNoErrors();
assertEquals(0, tokens.size());
}
@Test
public void testEOL1() {
IDocument document = createDocument("\n");
@ -84,6 +85,7 @@ public class TestTokenizer {
assertEquals(1, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.EOL, "\n");
}
@Test
public void testEOL2() {
IDocument document = createDocument("\r\n");
@ -92,6 +94,7 @@ public class TestTokenizer {
assertEquals(1, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.EOL, "\r\n");
}
@Test
public void testEOL3() {
IDocument document = createDocument("\n\r\n\n");
@ -102,6 +105,7 @@ public class TestTokenizer {
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\r\n");
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellText() {
// default mode is shell
@ -110,13 +114,12 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(4, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"random");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "random");
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
checkToken(tokens.get(2), document, ITokenConstants.WORD,
"stuff");
checkToken(tokens.get(2), document, ITokenConstants.WORD, "stuff");
checkToken(tokens.get(3), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellTokens() {
// default mode is shell
@ -125,18 +128,16 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(8, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.SH_WHILE,
"while");
checkToken(tokens.get(1), document, ITokenConstants.WORD,
"true");
checkToken(tokens.get(0), document, ITokenConstants.SH_WHILE, "while");
checkToken(tokens.get(1), document, ITokenConstants.WORD, "true");
checkToken(tokens.get(2), document, ITokenConstants.SEMI, ";");
checkToken(tokens.get(3), document, ITokenConstants.SH_DO, "do");
checkToken(tokens.get(4), document, ITokenConstants.WORD, "ls");
checkToken(tokens.get(5), document, ITokenConstants.SEMI, ";");
checkToken(tokens.get(6), document, ITokenConstants.SH_DONE,
"done");
checkToken(tokens.get(6), document, ITokenConstants.SH_DONE, "done");
checkToken(tokens.get(7), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellTokens2() {
// don't misread partial tokens
@ -145,11 +146,10 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"while_stuff");
checkToken(tokens.get(1), document, ITokenConstants.WORD,
"incase");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "while_stuff");
checkToken(tokens.get(1), document, ITokenConstants.WORD, "incase");
}
@Test
public void testShellTokens3() {
// don't interpret m4 strings in shell mode
@ -160,6 +160,7 @@ public class TestTokenizer {
assertEquals(1, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.SH_STRING_BACKTICK, "foo'", 5);
}
@Test
public void testShellTokens4() {
String text = "echo $if $((foo)) $\n";
@ -181,6 +182,7 @@ public class TestTokenizer {
checkToken(tokens.get(10), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellTokens5() {
String text = "while do select for until done\n";
@ -197,6 +199,7 @@ public class TestTokenizer {
checkToken(tokens.get(6), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellComments() {
// comments are stripped and ignored in the shell mode
@ -205,10 +208,10 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.SH_FOR,
"for");
checkToken(tokens.get(0), document, ITokenConstants.SH_FOR, "for");
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellComments2() {
// comments are stripped and ignored in the shell mode
@ -221,6 +224,7 @@ public class TestTokenizer {
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Tokens0() {
String text = "while_stuff incase";
@ -228,56 +232,49 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, true);
checkNoErrors();
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"while_stuff");
checkToken(tokens.get(1), document, ITokenConstants.WORD,
"incase");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "while_stuff");
checkToken(tokens.get(1), document, ITokenConstants.WORD, "incase");
}
@Test
public void testShellStrings() {
String QUOTED =
"ls -la \"*.c\"";
String QUOTED = "ls -la \"*.c\"";
String text = "echo `" + QUOTED + "`\n";
IDocument document = createDocument(text);
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(3, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK,
QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_BACKTICK, QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellStrings2() {
String QUOTED =
"ls -la 'space file'";
String QUOTED = "ls -la 'space file'";
String text = "echo \"" + QUOTED + "\"\n";
IDocument document = createDocument(text);
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(3, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE,
QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_DOUBLE, QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testShellStrings3() {
String QUOTED =
"echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
String QUOTED = "echo \"*.c\" | sed s/[a-z]/[A-Z]/g";
String text = "echo '" + QUOTED + "'\n";
IDocument document = createDocument(text);
List<Token> tokens = tokenize(document, false);
checkNoErrors();
assertEquals(3, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE,
QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(0), document, ITokenConstants.WORD, "echo");
checkToken(tokens.get(1), document, ITokenConstants.SH_STRING_SINGLE, QUOTED, QUOTED.length() + 2);
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Tokens1() {
String text = "define(`hi\', `HI\')\n";
@ -285,18 +282,16 @@ public class TestTokenizer {
List<Token> tokens = tokenize(document, true);
checkNoErrors();
assertEquals(7, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"define");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "define");
checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
// strings are unquoted in token text
checkToken(tokens.get(2), document, ITokenConstants.M4_STRING,
"hi", 4);
checkToken(tokens.get(2), document, ITokenConstants.M4_STRING, "hi", 4);
checkToken(tokens.get(3), document, ITokenConstants.COMMA, ",");
checkToken(tokens.get(4), document, ITokenConstants.M4_STRING,
"HI", 4);
checkToken(tokens.get(4), document, ITokenConstants.M4_STRING, "HI", 4);
checkToken(tokens.get(5), document, ITokenConstants.RPAREN, ")");
checkToken(tokens.get(6), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Comments() {
String text = "dnl # comment\n";
@ -305,9 +300,9 @@ public class TestTokenizer {
checkNoErrors();
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD, "dnl");
checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT,
"# comment\n");
checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT, "# comment\n");
}
@Test
public void testM4Comments2() {
String text = "dnl /* word(`quoted')\n" + "*/\n";
@ -319,10 +314,10 @@ public class TestTokenizer {
List<Token> tokens = tokenize(tokenizer);
assertEquals(3, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD, "dnl");
checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT,
"/* word(`quoted')\n*/");
checkToken(tokens.get(1), document, ITokenConstants.M4_COMMENT, "/* word(`quoted')\n*/");
checkToken(tokens.get(2), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Strings1() {
// double quotes only removes one level of quotes
@ -333,10 +328,10 @@ public class TestTokenizer {
List<Token> tokens = tokenize(tokenizer);
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.M4_STRING,
"`double'", 8 + 1 + 1);
checkToken(tokens.get(0), document, ITokenConstants.M4_STRING, "`double'", 8 + 1 + 1);
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Strings2() {
String text = "myword(!!boundary==)\n";
@ -347,14 +342,13 @@ public class TestTokenizer {
List<Token> tokens = tokenize(tokenizer);
assertEquals(5, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"myword");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "myword");
checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
checkToken(tokens.get(2), document, ITokenConstants.M4_STRING,
"boundary", 8 + 2 + 2);
checkToken(tokens.get(2), document, ITokenConstants.M4_STRING, "boundary", 8 + 2 + 2);
checkToken(tokens.get(3), document, ITokenConstants.RPAREN, ")");
checkToken(tokens.get(4), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4Tokens2() {
// dollar is not seen in m4 mode (only important when expanding)
@ -365,8 +359,7 @@ public class TestTokenizer {
List<Token> tokens = tokenize(tokenizer);
assertEquals(8, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.WORD,
"define");
checkToken(tokens.get(0), document, ITokenConstants.WORD, "define");
checkToken(tokens.get(1), document, ITokenConstants.LPAREN, "(");
checkToken(tokens.get(2), document, ITokenConstants.WORD, "foo");
checkToken(tokens.get(3), document, ITokenConstants.COMMA, ",");
@ -375,21 +368,22 @@ public class TestTokenizer {
checkToken(tokens.get(6), document, ITokenConstants.RPAREN, ")");
checkToken(tokens.get(7), document, ITokenConstants.EOL, "\n");
}
@Test
public void testM4QuoteNesting() {
String quote = "this is `nested\'!";
String text = "`" + quote +"'\n";
String text = "`" + quote + "'\n";
IDocument document = createDocument(text);
AutoconfTokenizer tokenizer = createTokenizer(document);
tokenizer.setM4Context(true);
List<Token> tokens = tokenize(tokenizer);
assertEquals(2, tokens.size());
checkToken(tokens.get(0), document, ITokenConstants.M4_STRING,
quote, quote.length() + 2);
checkToken(tokens.get(0), document, ITokenConstants.M4_STRING, quote, quote.length() + 2);
checkToken(tokens.get(1), document, ITokenConstants.EOL, "\n");
}
@Test
public void testMixedContext() {
String text = "AM_INIT([arg])if true\n";
@ -441,18 +435,17 @@ public class TestTokenizer {
fail(exception.toString());
});
}
private void checkToken(Token token, IDocument document, int type) {
assertEquals(type, token.getType());
assertSame(document, token.getDocument());
assertTrue(token.getOffset() >= 0);
assertTrue(token.getType() == ITokenConstants.EOF || token.getLength() > 0);
assertEquals(document.get().substring(token.getOffset(),
token.getOffset() + token.getLength()), token.getText());
assertEquals(document.get().substring(token.getOffset(), token.getOffset() + token.getLength()),
token.getText());
}
private void checkToken(Token token, IDocument document, int type,
String text) {
private void checkToken(Token token, IDocument document, int type, String text) {
assertEquals(type, token.getType());
assertSame(document, token.getDocument());
assertTrue(token.getOffset() >= 0);
@ -460,8 +453,7 @@ public class TestTokenizer {
assertEquals(text.length(), token.getLength());
}
private void checkToken(Token token, IDocument document, int type,
String text, int length) {
private void checkToken(Token token, IDocument document, int type, String text, int length) {
assertEquals(type, token.getType());
assertSame(document, token.getDocument());
assertTrue(token.getOffset() >= 0);

10
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/AutotoolsUIPlugin.java
View file

@ -39,9 +39,9 @@ public class AutotoolsUIPlugin extends AbstractUIPlugin {
// The shared instance
private static AutotoolsUIPlugin plugin;
private ResourceBundle resourceBundle;
/**
* The constructor.
*/
@ -59,7 +59,7 @@ public class AutotoolsUIPlugin extends AbstractUIPlugin {
public static String getPluginId() {
return PLUGIN_ID;
}
public static String getUniqueIdentifier() {
if (getDefault() == null) {
// If the default instance is not yet initialized,
@ -89,7 +89,7 @@ public class AutotoolsUIPlugin extends AbstractUIPlugin {
/**
* Returns the string from the plugin's resource bundle,
* or 'key' if not found.
*
*
* @param key the message key
* @return the resource bundle message
*/
@ -146,7 +146,7 @@ public class AutotoolsUIPlugin extends AbstractUIPlugin {
* Returns the active workbench page or <code>null</code> if none.
*/
public static IWorkbenchPage getActivePage() {
IWorkbenchWindow window= getActiveWorkbenchWindow();
IWorkbenchWindow window = getActiveWorkbenchWindow();
if (window != null) {
return window.getActivePage();
}

17
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AcInitElement.java
View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.internal.autotools.core.VersionComparator;
public class AcInitElement extends AutoconfMacroElement {
private static final String BAD_VERSION_NUMBER = "AC_INIT_badVersionNumber";
public AcInitElement(String name) {
super(name);
}
@ -31,15 +31,14 @@ public class AcInitElement extends AutoconfMacroElement {
@Override
public void validate(String version) throws InvalidMacroException {
super.validate(version);
if (this.getChildren().length == 0)
return;
if (VersionComparator.compare(version,
AutotoolsPropertyConstants.AC_VERSION_2_59) >= 0){
if (VersionComparator.compare(version, AutotoolsPropertyConstants.AC_VERSION_2_59) >= 0) {
if (this.getChildren().length < 2)
return;
// autoconf 2.67 onwards allows a more relaxed VERSION string format,
// so only validate arguments for earlier versions
if (VersionComparator.compare(version, AutotoolsPropertyConstants.AC_VERSION_2_67) < 0)
@ -48,8 +47,8 @@ public class AcInitElement extends AutoconfMacroElement {
return;
}
private void validateMultipleArguments () throws InvalidMacroException{
private void validateMultipleArguments() throws InvalidMacroException {
// There are no restrictions on the first argument.
@ -57,7 +56,7 @@ public class AcInitElement extends AutoconfMacroElement {
AutoconfElement argument = this.getChildren()[1];
// match a digit followed by a dot zero or more times
// but always end with a digit
if (!argument.getName().matches("(\\d*\\.)*((\\d+))")){
if (!argument.getName().matches("(\\d*\\.)*((\\d+))")) {
throw new InvalidMacroException(AutoconfEditorMessages.getString(BAD_VERSION_NUMBER), argument);
}
}

100
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfAnnotationHover.java
View file

@ -34,17 +34,16 @@ import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.LineRange;
import org.eclipse.swt.widgets.Shell;
public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHoverExtension {
/**
* Returns the distance to the ruler line.
*/
protected int compareRulerLine(Position position, IDocument document, int line) {
if (position.getOffset() > -1 && position.getLength() > -1) {
try {
int markerLine= document.getLineOfOffset(position.getOffset());
int markerLine = document.getLineOfOffset(position.getOffset());
if (line == markerLine)
return 1;
if (markerLine <= line && line <= document.getLineOfOffset(position.getOffset() + position.getLength()))
@ -52,10 +51,10 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
} catch (BadLocationException x) {
}
}
return 0;
}
/**
* Selects a set of markers from the two lists. By default, it just returns
* the set of exact matches.
@ -68,32 +67,32 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
* Returns one marker which includes the ruler's line of activity.
*/
protected List<Annotation> getAnnotationsForLine(ISourceViewer viewer, int line) {
IDocument document= viewer.getDocument();
IAnnotationModel model= viewer.getAnnotationModel();
IDocument document = viewer.getDocument();
IAnnotationModel model = viewer.getAnnotationModel();
if (model == null)
return null;
List<Annotation> exact= new ArrayList<>();
List<Annotation> including= new ArrayList<>();
List<Annotation> exact = new ArrayList<>();
List<Annotation> including = new ArrayList<>();
Iterator<?> e = model.getAnnotationIterator();
while (e.hasNext()) {
Object o= e.next();
Object o = e.next();
if (o instanceof Annotation) {
Annotation a= (Annotation) o;
Annotation a = (Annotation) o;
switch (compareRulerLine(model.getPosition(a), document, line)) {
case 1:
exact.add(a);
break;
case 2:
including.add(a);
break;
case 1:
exact.add(a);
break;
case 2:
including.add(a);
break;
}
}
}
return select(exact, including);
}
@ -101,73 +100,72 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
List<Annotation> annotations = getAnnotationsForLine(sourceViewer, lineNumber);
if (annotations != null && annotations.size() > 0) {
if (annotations.size() == 1) {
// optimization
Annotation annotation = annotations.get(0);
String message= annotation.getText();
String message = annotation.getText();
if (message != null && message.trim().length() > 0)
return formatSingleMessage(message);
} else {
List<String> messages= new ArrayList<>();
Iterator<Annotation> e= annotations.iterator();
List<String> messages = new ArrayList<>();
Iterator<Annotation> e = annotations.iterator();
while (e.hasNext()) {
Annotation annotation = e.next();
String message= annotation.getText();
String message = annotation.getText();
if (message != null && message.trim().length() > 0)
messages.add(message.trim());
}
if (messages.size() == 1)
return formatSingleMessage(messages.get(0));
if (messages.size() > 1)
return formatMultipleMessages(messages);
}
}
return null;
}
/*
* Formats a message as HTML text.
*/
private String formatSingleMessage(String message) {
StringBuilder buffer= new StringBuilder();
StringBuilder buffer = new StringBuilder();
HTMLPrinter.addPageProlog(buffer);
HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message));
HTMLPrinter.addPageEpilog(buffer);
return buffer.toString();
}
/*
* Formats several message as HTML text.
*/
private String formatMultipleMessages(List<String> messages) {
StringBuilder buffer= new StringBuilder();
StringBuilder buffer = new StringBuilder();
HTMLPrinter.addPageProlog(buffer);
HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
HTMLPrinter.addParagraph(buffer, HTMLPrinter
.convertToHTMLContent(AutoconfEditorMessages.getString("AutoconfAnnotationHover.multipleMarkers"))); //$NON-NLS-1$
HTMLPrinter.startBulletList(buffer);
Iterator<String> e= messages.iterator();
Iterator<String> e = messages.iterator();
while (e.hasNext())
HTMLPrinter.addBullet(buffer, HTMLPrinter.convertToHTMLContent(e.next()));
HTMLPrinter.endBulletList(buffer);
HTMLPrinter.endBulletList(buffer);
HTMLPrinter.addPageEpilog(buffer);
return buffer.toString();
}
// IAnnotationHoverExtension members
// We need to use the extension to get a Hover Control Creator which
// handles html.
@Override
public IInformationControlCreator getHoverControlCreator() {
return new IInformationControlCreator() {
@ -177,17 +175,17 @@ public class AutoconfAnnotationHover implements IAnnotationHover, IAnnotationHov
}
};
}
@Override
public boolean canHandleMouseCursor() {
return false;
}
@Override
public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
return new LineRange(lineNumber, 1);
}
@Override
public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleNumberOfLines) {
return getHoverInfo(sourceViewer, lineRange.getStartLine());

157
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfCodeScanner.java
View file

@ -38,15 +38,14 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
public class AutoconfCodeScanner extends RuleBasedScanner {
private Map<String, IToken> fTokenMap= new HashMap<>();
private Map<String, IToken> fTokenMap = new HashMap<>();
private String[] fPropertyNamesColor;
/**
* Preference keys for boolean preferences which are <code>true</code>,
* iff the corresponding token should be rendered bold.
* iff the corresponding token should be rendered bold.
*/
private String[] fPropertyNamesBold;
/**
@ -55,49 +54,42 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
*/
private String[] fPropertyNamesItalic;
private static String[] keywords = {
"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
private static String[] keywords = { "case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
static final String[] fTokenProperties = new String[] {
ColorManager.AUTOCONF_COMMENT_COLOR,
ColorManager.AUTOCONF_KEYWORD_COLOR,
ColorManager.AUTOCONF_ACMACRO_COLOR,
ColorManager.AUTOCONF_AMMACRO_COLOR,
ColorManager.AUTOCONF_VAR_REF_COLOR,
ColorManager.AUTOCONF_VAR_SET_COLOR,
ColorManager.AUTOCONF_CODESEQ_COLOR,
ColorManager.AUTOCONF_DEFAULT_COLOR,
};
static final String[] fTokenProperties = new String[] { ColorManager.AUTOCONF_COMMENT_COLOR,
ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_ACMACRO_COLOR,
ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_VAR_REF_COLOR,
ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_CODESEQ_COLOR,
ColorManager.AUTOCONF_DEFAULT_COLOR, };
public AutoconfCodeScanner() {
initialize();
IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken other = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
IToken comment = getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
List<IRule> rules= new ArrayList<>();
List<IRule> rules = new ArrayList<>();
// Add rule for single line comments.
rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
// Add special recursive rule for strings which allows variable
// references to be internally tokenized.
RecursiveSingleLineRule stringRule =
new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
RecursiveSingleLineRule stringRule = new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(stringRule);
// Add rule for variable references
rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
// Add rule for strings
@ -114,31 +106,31 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
// Add rule for m4_ macros
rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
// Add rule for code sequences starting with <<EOF and ending with EOF
rules.add(new InlineDataRule(code));
// Add word rule for keywords.
WordRule wordRule= new WordRule(new AutoconfWordDetector(), Token.UNDEFINED);
for (int i= 0; i < keywords.length; i++)
WordRule wordRule = new WordRule(new AutoconfWordDetector(), Token.UNDEFINED);
for (int i = 0; i < keywords.length; i++)
wordRule.addWord(keywords[i], keyword);
rules.add(wordRule);
// Add word rule for identifier.
rules.add(new AutoconfIdentifierRule(other));
// Make sure we don't treat "\#" as comment start.
rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
setDefaultReturnToken(other);
IRule[] result= new IRule[rules.size()];
IRule[] result = new IRule[rules.size()];
rules.toArray(result);
setRules(result);
}
protected Token getToken(String key) {
return (Token) fTokenMap.get(key);
}
@ -150,26 +142,27 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
protected String[] getTokenProperties() {
return fTokenProperties;
}
private int indexOf(String property) {
if (property != null) {
int length= fPropertyNamesColor.length;
for (int i= 0; i < length; i++) {
if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
int length = fPropertyNamesColor.length;
for (int i = 0; i < length; i++) {
if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i])
|| property.equals(fPropertyNamesItalic[i]))
return i;
}
}
return -1;
}
public boolean affectsBehavior(PropertyChangeEvent event) {
return indexOf(event.getProperty()) >= 0;
}
public void adaptToPreferenceChange(PropertyChangeEvent event) {
String p= event.getProperty();
int index= indexOf(p);
Token token= getToken(fPropertyNamesColor[index]);
String p = event.getProperty();
int index = indexOf(p);
Token token = getToken(fPropertyNamesColor[index]);
if (fPropertyNamesColor[index].equals(p))
adaptToColorChange(event, token);
else if (fPropertyNamesBold[index].equals(p))
@ -179,72 +172,74 @@ public class AutoconfCodeScanner extends RuleBasedScanner {
}
protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
RGB rgb= null;
Object value= event.getNewValue();
RGB rgb = null;
Object value = event.getNewValue();
if (value instanceof RGB) {
rgb= (RGB) value;
rgb = (RGB) value;
} else if (value instanceof String) {
rgb= StringConverter.asRGB((String) value);
rgb = StringConverter.asRGB((String) value);
}
if (rgb != null) {
TextAttribute attr= (TextAttribute) token.getData();
token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
TextAttribute attr = (TextAttribute) token.getData();
token.setData(
new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
}
}
protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
if (token == null) {
if (token == null) {
return;
}
boolean eventValue= false;
Object value= event.getNewValue();
boolean eventValue = false;
Object value = event.getNewValue();
if (value instanceof Boolean) {
eventValue= ((Boolean) value).booleanValue();
eventValue = ((Boolean) value).booleanValue();
} else if (IPreferenceStore.TRUE.equals(value)) {
eventValue= true;
eventValue = true;
}
TextAttribute attr= (TextAttribute) token.getData();
boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
if (activeValue != eventValue) {
token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
TextAttribute attr = (TextAttribute) token.getData();
boolean activeValue = (attr.getStyle() & styleAttribute) == styleAttribute;
if (activeValue != eventValue) {
token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(),
eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
}
}
protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
Color color= null;
Color color = null;
if (colorID != null) {
color= AutoconfEditor.getPreferenceColor(colorID);
color = AutoconfEditor.getPreferenceColor(colorID);
}
IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
int style = store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
if (store.getBoolean(italicKey)) {
style |= SWT.ITALIC;
}
}
return new TextAttribute(color, null, style);
}
/**
* Must be called after the constructor has been called.
*/
public final void initialize() {
fPropertyNamesColor= getTokenProperties();
int length= fPropertyNamesColor.length;
fPropertyNamesBold= new String[length];
fPropertyNamesItalic= new String[length];
for (int i= 0; i < length; i++) {
fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
fPropertyNamesColor = getTokenProperties();
int length = fPropertyNamesColor.length;
fPropertyNamesBold = new String[length];
fPropertyNamesItalic = new String[length];
for (int i = 0; i < length; i++) {
fPropertyNamesBold[i] = fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
fPropertyNamesItalic[i] = fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
}
}
@Override
public void unread() {
--fOffset;
fColumn = UNDEFINED;
--fOffset;
fColumn = UNDEFINED;
}
}

6
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfDocumentProvider.java
View file

@ -19,16 +19,16 @@ import org.eclipse.jface.text.IDocument;
import org.eclipse.ui.editors.text.TextFileDocumentProvider;
public class AutoconfDocumentProvider extends TextFileDocumentProvider {
public void shutdown() {
Iterator<?> e = getConnectedElementsIterator();
while (e.hasNext())
disconnect(e.next());
}
@Override
public IDocument getDocument(Object element) {
FileInfo info= getFileInfo(element);
FileInfo info = getFileInfo(element);
if (info != null)
return info.fTextFileBuffer.getDocument();
return getParentProvider().getDocument(element);

15
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfDocumentSetupParticipant.java
View file

@ -19,30 +19,27 @@ import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentListener;
public class AutoconfDocumentSetupParticipant implements
IDocumentSetupParticipant, IDocumentListener {
public class AutoconfDocumentSetupParticipant implements IDocumentSetupParticipant, IDocumentListener {
@Override
public void setup(IDocument document) {
AutoconfPartitioner partitioner =
new AutoconfPartitioner(
new AutoconfPartitionScanner(),
AutoconfPartitioner partitioner = new AutoconfPartitioner(new AutoconfPartitionScanner(),
AutoconfPartitionScanner.AUTOCONF_PARTITION_TYPES);
partitioner.connect(document, 1);
if (document instanceof IDocumentExtension3) {
IDocumentExtension3 extension3= (IDocumentExtension3) document;
IDocumentExtension3 extension3 = (IDocumentExtension3) document;
extension3.setDocumentPartitioner(AutoconfEditor.AUTOCONF_PARTITIONING, partitioner);
} else {
document.setDocumentPartitioner(partitioner);
}
// document.addDocumentListener(this);
// document.addDocumentListener(this);
}
@Override
public void documentAboutToBeChanged(DocumentEvent e) {
// do nothing
}
@Override
public void documentChanged(DocumentEvent e) {
// do nothing

796
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditor.java
View file

File diff suppressed because it is too large Load diff

34
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMacroValidator.java
View file

@ -29,7 +29,6 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.BadLocationException;
/**
* Validate a macro call by checking against the stored macro prototypes
*/
@ -44,8 +43,7 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
}
@Override
public void validateMacroCall(AutoconfMacroElement macro)
throws ParseException, InvalidMacroException {
public void validateMacroCall(AutoconfMacroElement macro) throws ParseException, InvalidMacroException {
AutoconfPrototype p = AutoconfTextHover.getPrototype(macro.getName(), fEditor);
if (p != null) {
boolean tooFew = false;
@ -67,7 +65,7 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
break;
}
}
int length = macro.getEndOffset() - macro.getStartOffset();
int start = macro.getStartOffset();
int end = macro.getEndOffset();
@ -75,31 +73,25 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
try {
lineNumber = macro.getDocument().getLineOfOffset(start);
} catch (BadLocationException e) {
}
if (!justRight) {
if (tooFew) {
String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_FEW,
AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_FEW,
AutotoolsPlugin.getDefault().getPreferenceStore()
.getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
p.getName(), Integer.toString(minParms));
throw new ParseException(
formatString,
start, end,
lineNumber, 0, length,
IMarker.SEVERITY_WARNING);
throw new ParseException(formatString, start, end, lineNumber, 0, length, IMarker.SEVERITY_WARNING);
} else if (tooMany) {
String formatString = AutoconfEditorMessages.getFormattedString(AUTOCONF_MACRO_ARGS_TOO_MANY,
AutotoolsPlugin.getDefault().getPreferenceStore().getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
AutotoolsPlugin.getDefault().getPreferenceStore()
.getString(AutotoolsEditorPreferenceConstants.AUTOCONF_VERSION),
p.getName(), Integer.toString(maxParms));
throw new ParseException(
formatString,
start, end,
lineNumber, 0, length,
IMarker.SEVERITY_WARNING);
throw new ParseException(formatString, start, end, lineNumber, 0, length, IMarker.SEVERITY_WARNING);
}
}
IProject project = fEditor.getProject();
String acDocVer = AutoconfTextHover.getDefaultAutoconfMacrosVer();
try {
@ -114,7 +106,7 @@ public class AutoconfEditorMacroValidator implements IAutoconfMacroValidator {
} catch (CoreException ce1) {
// do nothing
}
macro.validate(acDocVer);
}

49
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfEditorMessages.java
View file

@ -18,15 +18,14 @@ import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
/**
* AutoconfEditorMessages
*/
public class AutoconfEditorMessages {
private static final String RESOURCE_BUNDLE= AutoconfEditorMessages.class.getName();
private static final String RESOURCE_BUNDLE = AutoconfEditorMessages.class.getName();
private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
private AutoconfEditorMessages() {
}
@ -34,7 +33,7 @@ public class AutoconfEditorMessages {
public static ResourceBundle getResourceBundle() {
return fgResourceBundle;
}
public static String getString(String key) {
try {
return fgResourceBundle.getString(key);
@ -42,75 +41,77 @@ public class AutoconfEditorMessages {
return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
}
}
/**
* Gets a string from the resource bundle and formats it with the argument
*
*
* @param key the string used to get the bundle value, must not be null
* @since 3.0
*/
public static String getFormattedString(String key, Object arg) {
String format= null;
String format = null;
try {
format= fgResourceBundle.getString(key);
format = fgResourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
}
if (arg == null)
arg= ""; //$NON-NLS-1$
arg = ""; //$NON-NLS-1$
return MessageFormat.format(format, new Object[] { arg });
}
/**
* Gets a string from the resource bundle and formats it with the arguments
*
*
* @param key the string used to get the bundle value, must not be null
* @since 3.0
*/
public static String getFormattedString(String key, Object arg1, Object arg2) {
String format= null;
String format = null;
try {
format= fgResourceBundle.getString(key);
format = fgResourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
}
if (arg1 == null)
arg1= ""; //$NON-NLS-1$
arg1 = ""; //$NON-NLS-1$
if (arg2 == null)
arg2= ""; //$NON-NLS-1$
arg2 = ""; //$NON-NLS-1$
return MessageFormat.format(format, new Object[] { arg1, arg2 });
}
/**
* Gets a string from the resource bundle and formats it with the arguments
*
*
* @param key the string used to get the bundle value, must not be null
* @since 3.0
*/
public static String getFormattedString(String key, Object arg1, Object arg2, Object arg3) {
String format= null;
String format = null;
try {
format= fgResourceBundle.getString(key);
format = fgResourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
}
if (arg1 == null)
arg1= ""; //$NON-NLS-1$
arg1 = ""; //$NON-NLS-1$
if (arg2 == null)
arg2= ""; //$NON-NLS-1$
arg2 = ""; //$NON-NLS-1$
if (arg3 == null)
arg3= ""; //$NON-NLS-1$
arg3 = ""; //$NON-NLS-1$
return MessageFormat.format(format, new Object[] { arg1, arg2, arg3 });
}
/**
* Gets a string from the resource bundle and formats it with the argument
*
*
* @param key the string used to get the bundle value, must not be null
* @since 3.0
*/
public static String getFormattedString(String key, boolean arg) {
String format= null;
String format = null;
try {
format= fgResourceBundle.getString(key);
format = fgResourceBundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
}

28
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfErrorHandler.java
View file

@ -26,23 +26,23 @@ import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.AnnotationModel;
import org.eclipse.ui.IEditorInput;
public class AutoconfErrorHandler implements IAutoconfErrorHandler {
public static final String CDT_ANNOTATION_INFO = "org.eclipse.cdt.ui.info"; //$NON-NLS-1$
public static final String CDT_ANNOTATION_WARNING = "org.eclipse.cdt.ui.warning"; //$NON-NLS-1$
public static final String CDT_ANNOTATION_ERROR = "org.eclipse.cdt.ui.error"; //$NON-NLS-1$
private int CDT_WARNING = 1;
private int CDT_ERROR = 2;
private Map<Position, Annotation> annotations = new HashMap<>();
private AnnotationModel fAnnotationModel;
public AutoconfErrorHandler(IEditorInput input) {
this.fAnnotationModel = (AnnotationModel)AutoconfEditor.getAutoconfDocumentProvider().getAnnotationModel(input);
this.fAnnotationModel = (AnnotationModel) AutoconfEditor.getAutoconfDocumentProvider()
.getAnnotationModel(input);
}
// TODO: no quickfixes yet implemented, but maybe in the future
private static class AutoconfAnnotation extends Annotation implements IQuickFixableAnnotation {
public AutoconfAnnotation(String annotationType, boolean persist, String message) {
@ -65,31 +65,29 @@ public class AutoconfErrorHandler implements IAutoconfErrorHandler {
}
}
@Override
public void handleError(ParseException e) {
Integer charStart = Integer.valueOf(e.getStartOffset());
Integer charEnd = Integer.valueOf(e.getEndOffset());
String annotationType = CDT_ANNOTATION_INFO;
if (e.getSeverity() == CDT_ERROR)
annotationType = CDT_ANNOTATION_ERROR;
else if (e.getSeverity() == CDT_WARNING)
annotationType = CDT_ANNOTATION_WARNING;
Annotation annotation = new AutoconfAnnotation(annotationType, true, e.getLocalizedMessage());
Position p = new Position(charStart.intValue(),charEnd.intValue() - charStart.intValue());
Position p = new Position(charStart.intValue(), charEnd.intValue() - charStart.intValue());
fAnnotationModel.addAnnotation(annotation, p);
annotations.put(p, annotation);
}
public void removeAllExistingMarkers()
{
public void removeAllExistingMarkers() {
fAnnotationModel.removeAllAnnotations();
annotations.clear();
}
public void removeExistingMarkers(int offset, int length)
{
public void removeExistingMarkers(int offset, int length) {
Iterator<Annotation> i = fAnnotationModel.getAnnotationIterator();
while (i.hasNext()) {
Annotation annotation = i.next();

8
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfIdentifierRule.java
View file

@ -23,7 +23,7 @@ public class AutoconfIdentifierRule implements IPredicateRule {
private IToken fToken;
private String fExtraChars = "_${@"; //$NON-NLS-1$
public AutoconfIdentifierRule(IToken token) {
Assert.isNotNull(token);
fToken = token;
@ -38,14 +38,14 @@ public class AutoconfIdentifierRule implements IPredicateRule {
public IToken evaluate(ICharacterScanner scanner) {
return evaluate(scanner, false);
}
@Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
int c = scanner.read();
if (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0) {
if (Character.isLetterOrDigit((char) c) || fExtraChars.indexOf((char) c) >= 0) {
do {
c = scanner.read();
} while (Character.isLetterOrDigit((char)c) || fExtraChars.indexOf((char)c) >= 0);
} while (Character.isLetterOrDigit((char) c) || fExtraChars.indexOf((char) c) >= 0);
scanner.unread();
return fToken;
}

1
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfKeywordDetector.java
View file

@ -28,4 +28,3 @@ public class AutoconfKeywordDetector implements IWordDetector {
}
}

8
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacro.java
View file

@ -44,18 +44,18 @@ public class AutoconfMacro implements Comparable<Object> {
AutoconfMacro y = (AutoconfMacro) x;
return getName().compareTo(y.getName());
}
@Override
public boolean equals(Object x) {
if (x == null)
return false;
AutoconfMacro y = (AutoconfMacro)x;
AutoconfMacro y = (AutoconfMacro) x;
return getName().equals(y.getName());
}
@Override
public int hashCode() {
return getName().hashCode();
}
}

167
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroCodeScanner.java
View file

@ -36,17 +36,16 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
public class AutoconfMacroCodeScanner extends RuleBasedScanner {
private Map<String, IToken> fTokenMap= new HashMap<>();
private Map<String, IToken> fTokenMap = new HashMap<>();
private String[] fPropertyNamesColor;
private int quoteLevel;
/**
* Preference keys for boolean preferences which are <code>true</code>,
* iff the corresponding token should be rendered bold.
* iff the corresponding token should be rendered bold.
*/
private String[] fPropertyNamesBold;
/**
@ -55,49 +54,42 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
*/
private String[] fPropertyNamesItalic;
private static String[] keywords = {
"case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
private static String[] keywords = { "case", "do", "done", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"esac", "if", "elif", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"else", "fi", "for", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"in", "then" }; //$NON-NLS-1$ //$NON-NLS-2$
static final String[] fTokenProperties = new String[] {
ColorManager.AUTOCONF_COMMENT_COLOR,
ColorManager.AUTOCONF_KEYWORD_COLOR,
ColorManager.AUTOCONF_ACMACRO_COLOR,
ColorManager.AUTOCONF_AMMACRO_COLOR,
ColorManager.AUTOCONF_VAR_REF_COLOR,
ColorManager.AUTOCONF_VAR_SET_COLOR,
ColorManager.AUTOCONF_CODESEQ_COLOR,
ColorManager.AUTOCONF_DEFAULT_COLOR,
};
static final String[] fTokenProperties = new String[] { ColorManager.AUTOCONF_COMMENT_COLOR,
ColorManager.AUTOCONF_KEYWORD_COLOR, ColorManager.AUTOCONF_ACMACRO_COLOR,
ColorManager.AUTOCONF_AMMACRO_COLOR, ColorManager.AUTOCONF_VAR_REF_COLOR,
ColorManager.AUTOCONF_VAR_SET_COLOR, ColorManager.AUTOCONF_CODESEQ_COLOR,
ColorManager.AUTOCONF_DEFAULT_COLOR, };
public AutoconfMacroCodeScanner() {
initialize();
IToken other= getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken other = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken keyword = getToken(ColorManager.AUTOCONF_KEYWORD_COLOR);
IToken comment= getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
IToken comment = getToken(ColorManager.AUTOCONF_COMMENT_COLOR);
IToken string = getToken(ColorManager.AUTOCONF_DEFAULT_COLOR);
IToken varRef = getToken(ColorManager.AUTOCONF_VAR_REF_COLOR);
IToken acmacro = getToken(ColorManager.AUTOCONF_ACMACRO_COLOR);
IToken ammacro = getToken(ColorManager.AUTOCONF_AMMACRO_COLOR);
IToken code = getToken(ColorManager.AUTOCONF_CODESEQ_COLOR);
List<IRule> rules= new ArrayList<>();
List<IRule> rules = new ArrayList<>();
// Add rule for single line comments.
rules.add(new RestrictedEndOfLineRule("dnl", "[]", comment)); //$NON-NLS-1$
rules.add(new RestrictedEndOfLineRule("#", "[]", comment, '\\')); //$NON-NLS-1$
// Add special recursive rule for strings which allows variable
// references to be internally tokenized.
RecursiveSingleLineRule stringRule =
new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
RecursiveSingleLineRule stringRule = new RecursiveSingleLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
stringRule.addRule(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(stringRule);
// Add rule for variable references
rules.add(new SingleLineRule("${", "}", varRef)); //$NON-NLS-1$ //$NON-NLS-2$
// Add rule for strings
@ -111,29 +103,29 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
// Add rule for m4_ macros
rules.add(new AutoconfMacroRule("m4_", new AutoconfM4WordDetector(), acmacro)); //$NON-NLS-1$
// Add rule for code sequences starting with <<EOF and ending with EOF
rules.add(new InlineDataRule(code));
// Add word rule for keywords.
WordRule wordRule= new WordRule(new AutoconfWordDetector(), other);
for (int i= 0; i < keywords.length; i++)
WordRule wordRule = new WordRule(new AutoconfWordDetector(), other);
for (int i = 0; i < keywords.length; i++)
wordRule.addWord(keywords[i], keyword);
rules.add(wordRule);
// Add word rule for identifier.
rules.add(new AutoconfIdentifierRule(other));
// Make sure we don't treat "\#" as comment start.
rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
rules.add(new WhitespaceRule(new AutoconfWhitespaceDetector()));
IRule[] result= new IRule[rules.size()];
IRule[] result = new IRule[rules.size()];
rules.toArray(result);
setRules(result);
}
@Override
public IToken nextToken() {
int ch = read();
@ -159,30 +151,31 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
protected String[] getTokenProperties() {
return fTokenProperties;
}
private int indexOf(String property) {
if (property != null) {
int length= fPropertyNamesColor.length;
for (int i= 0; i < length; i++) {
if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i]) || property.equals(fPropertyNamesItalic[i]))
int length = fPropertyNamesColor.length;
for (int i = 0; i < length; i++) {
if (property.equals(fPropertyNamesColor[i]) || property.equals(fPropertyNamesBold[i])
|| property.equals(fPropertyNamesItalic[i]))
return i;
}
}
return -1;
}
public void incQuoteLevel() {
++quoteLevel;
}
public void decQuoteLevel() {
--quoteLevel;
}
public void resetQuoteLevel() {
quoteLevel = 0;
}
public int getQuoteLevel() {
return quoteLevel;
}
@ -190,11 +183,11 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
public boolean affectsBehavior(PropertyChangeEvent event) {
return indexOf(event.getProperty()) >= 0;
}
public void adaptToPreferenceChange(PropertyChangeEvent event) {
String p= event.getProperty();
int index= indexOf(p);
Token token= getToken(fPropertyNamesColor[index]);
String p = event.getProperty();
int index = indexOf(p);
Token token = getToken(fPropertyNamesColor[index]);
if (fPropertyNamesColor[index].equals(p))
adaptToColorChange(event, token);
else if (fPropertyNamesBold[index].equals(p))
@ -204,73 +197,75 @@ public class AutoconfMacroCodeScanner extends RuleBasedScanner {
}
protected void adaptToColorChange(PropertyChangeEvent event, Token token) {
RGB rgb= null;
Object value= event.getNewValue();
RGB rgb = null;
Object value = event.getNewValue();
if (value instanceof RGB) {
rgb= (RGB) value;
rgb = (RGB) value;
} else if (value instanceof String) {
rgb= StringConverter.asRGB((String) value);
rgb = StringConverter.asRGB((String) value);
}
if (rgb != null) {
TextAttribute attr= (TextAttribute) token.getData();
token.setData(new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
TextAttribute attr = (TextAttribute) token.getData();
token.setData(
new TextAttribute(ColorManager.getDefault().getColor(rgb), attr.getBackground(), attr.getStyle()));
}
}
protected void adaptToStyleChange(PropertyChangeEvent event, Token token, int styleAttribute) {
if (token == null) {
if (token == null) {
return;
}
boolean eventValue= false;
Object value= event.getNewValue();
boolean eventValue = false;
Object value = event.getNewValue();
if (value instanceof Boolean) {
eventValue= ((Boolean) value).booleanValue();
eventValue = ((Boolean) value).booleanValue();
} else if (IPreferenceStore.TRUE.equals(value)) {
eventValue= true;
eventValue = true;
}
TextAttribute attr= (TextAttribute) token.getData();
boolean activeValue= (attr.getStyle() & styleAttribute) == styleAttribute;
if (activeValue != eventValue) {
token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(), eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
TextAttribute attr = (TextAttribute) token.getData();
boolean activeValue = (attr.getStyle() & styleAttribute) == styleAttribute;
if (activeValue != eventValue) {
token.setData(new TextAttribute(attr.getForeground(), attr.getBackground(),
eventValue ? attr.getStyle() | styleAttribute : attr.getStyle() & ~styleAttribute));
}
}
protected TextAttribute createTextAttribute(String colorID, String boldKey, String italicKey) {
Color color= null;
Color color = null;
if (colorID != null) {
color= AutoconfEditor.getPreferenceColor(colorID);
color = AutoconfEditor.getPreferenceColor(colorID);
}
IPreferenceStore store= AutotoolsPlugin.getDefault().getPreferenceStore();
int style= store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
IPreferenceStore store = AutotoolsPlugin.getDefault().getPreferenceStore();
int style = store.getBoolean(boldKey) ? SWT.BOLD : SWT.NORMAL;
if (store.getBoolean(italicKey)) {
style |= SWT.ITALIC;
}
}
return new TextAttribute(color, null, style);
}
/**
* Must be called after the constructor has been called.
*/
public final void initialize() {
resetQuoteLevel();
fPropertyNamesColor= getTokenProperties();
int length= fPropertyNamesColor.length;
fPropertyNamesBold= new String[length];
fPropertyNamesItalic= new String[length];
for (int i= 0; i < length; i++) {
fPropertyNamesBold[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
fPropertyNamesItalic[i]= fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
resetQuoteLevel();
fPropertyNamesColor = getTokenProperties();
int length = fPropertyNamesColor.length;
fPropertyNamesBold = new String[length];
fPropertyNamesItalic = new String[length];
for (int i = 0; i < length; i++) {
fPropertyNamesBold[i] = fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_BOLD_SUFFIX;
fPropertyNamesItalic[i] = fPropertyNamesColor[i] + AutotoolsEditorPreferenceConstants.EDITOR_ITALIC_SUFFIX;
addToken(fPropertyNamesColor[i], fPropertyNamesBold[i], fPropertyNamesItalic[i]);
}
}
@Override
public void unread() {
--fOffset;
fColumn = UNDEFINED;
--fOffset;
fColumn = UNDEFINED;
}
}

23
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroContentAssistProcessor.java
View file

@ -25,12 +25,10 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
public class AutoconfMacroContentAssistProcessor implements IContentAssistProcessor {
public class AutoconfMacroContentAssistProcessor implements
IContentAssistProcessor {
protected AutoconfEditor editor;
/**
* @since 2.0
*/
@ -48,11 +46,10 @@ public class AutoconfMacroContentAssistProcessor implements
}
return offset;
}
@Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
int offset) {
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
IDocument document = viewer.getDocument();
String prefix = ""; //$NON-NLS-1$
AutoconfMacro[] macros = AutoconfTextHover.getMacroList(editor);
@ -80,11 +77,12 @@ public class AutoconfMacroContentAssistProcessor implements
if (macros[i].hasParms()) {
// Provide parameter info as context information that
// is tied to the completion proposal.
ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(), macros[i].getParms());
ci = new AutoconfMacroProposalContextInformation(macros[i].getParms(),
macros[i].getParms());
ci.setContextInformationPosition(offset - prefixLen + cursorPos - 1);
}
ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen, cursorPos, null,
name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
ICompletionProposal cp = new CompletionProposal(template, offset - prefixLen, prefixLen,
cursorPos, null, name, ci, AutoconfTextHover.getIndexedInfo(name, editor));
validList.add(cp);
}
}
@ -96,8 +94,7 @@ public class AutoconfMacroContentAssistProcessor implements
}
@Override
public IContextInformation[] computeContextInformation(ITextViewer viewer,
int offset) {
public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
// TODO Auto-generated method stub
return null;
}

5
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroDamagerRepairer.java
View file

@ -17,12 +17,12 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.ITokenScanner;
public class AutoconfMacroDamagerRepairer extends DefaultDamagerRepairer {
public final static String UNMATCHED_RIGHT_PARENTHESIS = "UnmatchedRightParenthesis"; //$NON-NLS-1$
public final static String UNMATCHED_LEFT_PARENTHESIS = "UnmatchedLeftParenthesis"; //$NON-NLS-1$
public final static String UNMATCHED_RIGHT_QUOTE = "UnmatchedRightQuote"; //$NON-NLS-1$
public final static String UNMATCHED_LEFT_QUOTE = "UnmatchedLeftQuote"; //$NON-NLS-1$
/**
* Creates a damager/repairer that uses the given scanner. The scanner may
* not be <code>null</code> and is assumed to return only token that carry
@ -35,5 +35,4 @@ public class AutoconfMacroDamagerRepairer extends DefaultDamagerRepairer {
super(scanner);
}
}

181
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroParameterListValidator.java
View file

@ -28,7 +28,7 @@ import org.eclipse.swt.custom.StyleRange;
/**
* This class provides the macro call parameter parsing for the Autoconf Editor hover
* It is modified from the CDT class CParameterListValidator
*
*
* @author jjohnstn
*
*/
@ -36,25 +36,25 @@ public class AutoconfMacroParameterListValidator implements IContextInformationV
private int fPosition;
private ITextViewer fViewer;
private IContextInformation fInformation;
private int fCurrentParameter;
public AutoconfMacroParameterListValidator() {
}
@Override
public void install(IContextInformation info, ITextViewer viewer, int documentPosition) {
fPosition= documentPosition;
fViewer= viewer;
fInformation= info;
fCurrentParameter= -1;
fPosition = documentPosition;
fViewer = viewer;
fInformation = info;
fCurrentParameter = -1;
}
private int getStringEnd(IDocument d, int pos, int end, char ch) throws BadLocationException {
while (pos < end) {
char curr= d.getChar(pos);
char curr = d.getChar(pos);
pos++;
if (curr == '\\') {
// ignore escaped characters
@ -65,12 +65,12 @@ public class AutoconfMacroParameterListValidator implements IContextInformationV
}
return end;
}
private int getCharCount(IDocument document, int start, int end,
char increment, char decrement, boolean considerNesting) throws BadLocationException {
private int getCharCount(IDocument document, int start, int end, char increment, char decrement,
boolean considerNesting) throws BadLocationException {
Assert.isTrue((increment != 0 || decrement != 0) && increment != decrement);
// There are two nesting levels to worry about. Arguments can be
// quoted with [] which means to treat the contents as one arg.
// As well, macro calls can be nested within macro calls so we
@ -81,131 +81,130 @@ public class AutoconfMacroParameterListValidator implements IContextInformationV
while (start < end) {
char curr = document.getChar(start++);
switch (curr) {
case 'd':
if (start < end - 2) {
char next= document.getChar(start);
if (next == 'n') {
// a comment starts, advance to the comment end
next = document.getChar(start + 1);
if (next == 'l')
// dnl-comment: nothing to do anymore on this line
start= end;
}
case 'd':
if (start < end - 2) {
char next = document.getChar(start);
if (next == 'n') {
// a comment starts, advance to the comment end
next = document.getChar(start + 1);
if (next == 'l')
// dnl-comment: nothing to do anymore on this line
start = end;
}
}
break;
case '"':
case '\'':
start = getStringEnd(document, start, end, curr);
break;
default:
if ('[' == curr)
++macroQuotingLevel;
else if (']' == curr)
--macroQuotingLevel;
if (macroQuotingLevel != 0)
break;
case '"':
case '\'':
start= getStringEnd(document, start, end, curr);
break;
default:
if ('[' == curr)
++ macroQuotingLevel;
else if (']' == curr)
-- macroQuotingLevel;
if (macroQuotingLevel != 0)
if (considerNesting) {
if ('(' == curr)
++macroNestingLevel;
else if (')' == curr) {
--macroNestingLevel;
}
if (macroNestingLevel != 0)
break;
if (considerNesting) {
if ('(' == curr)
++ macroNestingLevel;
else if (')' == curr) {
-- macroNestingLevel;
}
if (macroNestingLevel != 0)
break;
}
if (increment != 0) {
if (curr == increment) {
++charCount;
}
if (increment != 0) {
if (curr == increment) {
++charCount;
}
}
if (decrement != 0) {
if (curr == decrement) {
-- charCount;
}
}
if (decrement != 0) {
if (curr == decrement) {
--charCount;
}
}
}
}
return charCount;
}
@Override
public boolean isContextInformationValid(int position) {
public boolean isContextInformationValid(int position) {
try {
if (position < fPosition)
return false;
IDocument document= fViewer.getDocument();
IRegion line= document.getLineInformationOfOffset(fPosition);
IDocument document = fViewer.getDocument();
IRegion line = document.getLineInformationOfOffset(fPosition);
if (position > line.getOffset() + line.getLength())
return false;
return (getCharCount(document, fPosition, position, '(', ')', false) >= 0);
} catch (BadLocationException x) {
return false;
}
}
@Override
public boolean updatePresentation(int position, TextPresentation presentation) {
int currentParameter= -1;
int currentParameter = -1;
try {
currentParameter= getCharCount(fViewer.getDocument(), fPosition, position, ',', (char) 0, true);
currentParameter = getCharCount(fViewer.getDocument(), fPosition, position, ',', (char) 0, true);
} catch (BadLocationException x) {
return false;
}
if (fCurrentParameter != -1) {
if (currentParameter == fCurrentParameter)
return false;
}
presentation.clear();
fCurrentParameter= currentParameter;
fCurrentParameter = currentParameter;
//Don't presume what has been done to the string, rather use as is
String s= fInformation.getInformationDisplayString();
String s = fInformation.getInformationDisplayString();
//@@@ This is obviously going to have problems with functions such
//int myfunction(int (*function_argument)(void * extra, int param), void * extra)
//int myfunction(/*A comment, indeed */int a);
int start= 0;
int occurrences= 0;
int start = 0;
int occurrences = 0;
while (occurrences < fCurrentParameter) {
int found= s.indexOf(',', start);
int found = s.indexOf(',', start);
if (found == -1)
break;
start= found + 1;
++ occurrences;
start = found + 1;
++occurrences;
}
if (occurrences < fCurrentParameter) {
presentation.addStyleRange(new StyleRange(0, s.length(), null, null, SWT.NORMAL));
return true;
}
if (start == -1)
start= 0;
int end= s.indexOf(',', start);
start = 0;
int end = s.indexOf(',', start);
if (end == -1)
end= s.length();
if (start > 0)
end = s.length();
if (start > 0)
presentation.addStyleRange(new StyleRange(0, start, null, null, SWT.NORMAL));
if (end > start)
presentation.addStyleRange(new StyleRange(start, end - start, null, null, SWT.BOLD));
if (end < s.length())
presentation.addStyleRange(new StyleRange(end, s.length() - end, null, null, SWT.NORMAL));
return true;
}
}

48
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroPartitionRule.java
View file

@ -20,7 +20,6 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector;
import org.eclipse.jface.text.rules.IWordDetector;
import org.eclipse.jface.text.rules.Token;
public class AutoconfMacroPartitionRule implements IPredicateRule {
/**
* The default token to be returned on success and if nothing else has been
@ -52,7 +51,7 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
public IToken getSuccessToken() {
return token;
}
protected void matchParentheses(ICharacterScanner scanner) {
boolean finished = false;
int depth = 1;
@ -61,50 +60,48 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
while (!finished && c != ICharacterScanner.EOF) {
if (c == '[') {
++quoteDepth;
}
else if (c == ']') {
} else if (c == ']') {
--quoteDepth;
if (quoteDepth < 0)
finished = true;
}
if (quoteDepth == 0) {
if (c == ')') {
--depth;
if (depth <= 0)
finished = true;
}
else if (c == '(') {
--depth;
if (depth <= 0)
finished = true;
} else if (c == '(') {
++depth;
}
}
c = scanner.read();
}
}
@Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
// if (resume)
// return Token.UNDEFINED;
// if (resume)
// return Token.UNDEFINED;
return evaluate(scanner);
}
@Override
public IToken evaluate(ICharacterScanner scanner) {
int c = scanner.read();
fBuffer.setLength(0);
fBuffer.append((char)c);
fBuffer.append((char) c);
if (c == 'A') {
c = scanner.read();
fBuffer.append((char)c);
fBuffer.append((char) c);
if (c != 'C' && c != 'H' && c != 'M') {
unreadBuffer(scanner);
return Token.UNDEFINED;
return Token.UNDEFINED;
}
fDetector = generalMacroWordDetector;
} else if (c == 'm') {
c = scanner.read();
fBuffer.append((char)c);
fBuffer.append((char) c);
if (c != 4) {
unreadBuffer(scanner);
return Token.UNDEFINED;
@ -114,22 +111,19 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
unreadBuffer(scanner);
return Token.UNDEFINED;
}
c = scanner.read();
while (c != ICharacterScanner.EOF
&& fDetector.isWordPart((char) c)) {
c = scanner.read();
while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)) {
fBuffer.append((char) c);
c = scanner.read();
}
if (c != ICharacterScanner.EOF) {
if (c == ';' || fWsDetector.isWhitespace((char)c)) {
if (c == ';' || fWsDetector.isWhitespace((char) c)) {
// We are done
}
else if (c == '(') {
} else if (c == '(') {
matchParentheses(scanner);
}
else {
} else {
scanner.unread();
unreadBuffer(scanner);
return Token.UNDEFINED;
@ -142,7 +136,7 @@ public class AutoconfMacroPartitionRule implements IPredicateRule {
/**
* Returns the characters in the buffer to the scanner.
*
*
* @param scanner
* the scanner to be used
*/

30
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroProposalContextInformation.java
View file

@ -51,41 +51,43 @@ public class AutoconfMacroProposalContextInformation implements IContextInformat
* @param informationDisplayString the string to be displayed when presenting the context information,
* may not be <code>null</code>
*/
public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString, String informationDisplayString) {
public AutoconfMacroProposalContextInformation(Image image, String contextDisplayString,
String informationDisplayString) {
//Assert.isNotNull(informationDisplayString);
fImage= image;
fContextDisplayString= contextDisplayString;
fInformationDisplayString= informationDisplayString;
fImage = image;
fContextDisplayString = contextDisplayString;
fInformationDisplayString = informationDisplayString;
}
@Override
public boolean equals(Object object) {
if (object instanceof IContextInformation) {
IContextInformation contextInformation= (IContextInformation) object;
boolean equals= fInformationDisplayString.equalsIgnoreCase(contextInformation.getInformationDisplayString());
if (fContextDisplayString != null)
equals= equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString());
IContextInformation contextInformation = (IContextInformation) object;
boolean equals = fInformationDisplayString
.equalsIgnoreCase(contextInformation.getInformationDisplayString());
if (fContextDisplayString != null)
equals = equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString());
return equals;
}
return false;
}
@Override
public int hashCode() {
String combined = fInformationDisplayString.toLowerCase().concat(fContextDisplayString.toLowerCase());
return combined.hashCode();
}
@Override
public String getInformationDisplayString() {
return fInformationDisplayString;
}
@Override
public Image getImage() {
return fImage;
}
@Override
public String getContextDisplayString() {
if (fContextDisplayString != null)
@ -97,8 +99,8 @@ public class AutoconfMacroProposalContextInformation implements IContextInformat
public int getContextInformationPosition() {
return fInformationPosition;
}
public void setContextInformationPosition( int pos ){
public void setContextInformationPosition(int pos) {
fInformationPosition = pos;
}
}

11
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroRule.java
View file

@ -41,8 +41,7 @@ public class AutoconfMacroRule implements IRule {
private String fStartingSequence;
public AutoconfMacroRule(String startingSequence,
IWordDetector detector, IToken inToken) {
public AutoconfMacroRule(String startingSequence, IWordDetector detector, IToken inToken) {
token = inToken;
fDetector = detector;
fStartingSequence = startingSequence;
@ -62,14 +61,12 @@ public class AutoconfMacroRule implements IRule {
c = scanner.read();
}
while (c != ICharacterScanner.EOF
&& fDetector.isWordPart((char) c)) {
while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)) {
fBuffer.append((char) c);
c = scanner.read();
}
if (c != ICharacterScanner.EOF && c != '(' && c != ';'
&& !fWsDetector.isWhitespace((char)c)) {
if (c != ICharacterScanner.EOF && c != '(' && c != ';' && !fWsDetector.isWhitespace((char) c)) {
unreadBuffer(scanner);
return Token.UNDEFINED;
}
@ -80,7 +77,7 @@ public class AutoconfMacroRule implements IRule {
/**
* Returns the characters in the buffer to the scanner.
*
*
* @param scanner
* the scanner to be used
*/

3
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfMacroWordDetector.java
View file

@ -19,8 +19,7 @@ public class AutoconfMacroWordDetector implements IWordDetector {
@Override
public boolean isWordPart(char c) {
return ((Character.isLetter(c) && Character.isUpperCase(c)) ||
Character.isDigit(c) || c == '_');
return ((Character.isLetter(c) && Character.isUpperCase(c)) || Character.isDigit(c) || c == '_');
}
@Override

3
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPKGWordDetector.java
View file

@ -19,8 +19,7 @@ public class AutoconfPKGWordDetector implements IWordDetector {
@Override
public boolean isWordPart(char c) {
return ((Character.isLetter(c) && Character.isUpperCase(c)) ||
Character.isDigit(c) || c == '_');
return ((Character.isLetter(c) && Character.isUpperCase(c)) || Character.isDigit(c) || c == '_');
}
@Override

18
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitionScanner.java
View file

@ -24,37 +24,35 @@ import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
public class AutoconfPartitionScanner extends RuleBasedPartitionScanner {
public final static String AUTOCONF_MACRO = "autoconf_macro"; //$NON-NLS-1$
public final static String AUTOCONF_COMMENT = "autoconf_comment"; //$NON-NLS-1$
final static String[] AUTOCONF_PARTITION_TYPES=
new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
final static String[] AUTOCONF_PARTITION_TYPES = new String[] { AUTOCONF_MACRO, AUTOCONF_COMMENT };
/**
* Creates the partitioner and sets up the appropriate rules.
*/
public AutoconfPartitionScanner() {
super();
List<IRule> rules= new ArrayList<>();
List<IRule> rules = new ArrayList<>();
Token macro = new Token(AUTOCONF_MACRO);
Token comment = new Token(AUTOCONF_COMMENT);
// Add rule for target bodies.
rules.add(new AutoconfMacroPartitionRule(macro));
rules.add(new EndOfLineRule("dnl", comment)); //$NON-NLS-1$
rules.add(new SingleLineRule("\\#", null, Token.UNDEFINED));
rules.add(new EndOfLineRule("#", comment, '\\')); //$NON-NLS-1$
// We want to process identifiers that might have macro
// names inside them.
rules.add(new AutoconfIdentifierRule(Token.UNDEFINED));
IPredicateRule[] result= new IPredicateRule[rules.size()];
IPredicateRule[] result = new IPredicateRule[rules.size()];
rules.toArray(result);
setPredicateRules(result);
}
}

26
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfPartitioner.java
View file

@ -25,38 +25,32 @@ public class AutoconfPartitioner extends FastPartitioner {
// TODO Auto-generated constructor stub
super(scanner, legalContentTypes);
}
public void connect(IDocument document, int blah) {
super.connect(document);
}
// To optionally show partitions, we must do so by overriding the computePartitioning
// method. We cannot do it at connect time because the document may be zero length
// at the time and we will end up getting default partitioning from then on.
@Override
public ITypedRegion[] computePartitioning(int offset, int length,
boolean includeZeroLength) {
public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLength) {
ITypedRegion[] regions = super.computePartitioning(offset, length, includeZeroLength);
// Uncomment the following line to see partitioning.
// printPartitions(regions);
// printPartitions(regions);
return regions;
}
public void printPartitions(ITypedRegion[] partitions)
{
for (int i = 0; i < partitions.length; i++)
{
try
{
public void printPartitions(ITypedRegion[] partitions) {
for (int i = 0; i < partitions.length; i++) {
try {
System.out.print("Partition type: " + partitions[i].getType() //$NON-NLS-1$
+ ", offset: " + partitions[i].getOffset() //$NON-NLS-1$
+ ", length: " + partitions[i].getLength() //$NON-NLS-1$
+"\nText:\n" //$NON-NLS-1$
+ "\nText:\n" //$NON-NLS-1$
+ super.fDocument.get(partitions[i].getOffset(), partitions[i].getLength())
+ "\n---------------------------\n\n\n"); //$NON-NLS-1$
}
catch (BadLocationException e)
{
} catch (BadLocationException e) {
e.printStackTrace();
}
}

15
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfReconcilingStrategy.java
View file

@ -21,27 +21,26 @@ import org.eclipse.jface.text.reconciler.DirtyRegion;
import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
import org.eclipse.ui.texteditor.IDocumentProvider;
public class AutoconfReconcilingStrategy implements IReconcilingStrategy {
AutoconfContentOutlinePage outline;
// int lastRegionOffset;
// int lastRegionOffset;
AutoconfEditor editor;
IDocumentProvider documentProvider;
public AutoconfReconcilingStrategy(AutoconfEditor editor) {
outline= editor.getOutlinePage();
// lastRegionOffset = Integer.MAX_VALUE;
outline = editor.getOutlinePage();
// lastRegionOffset = Integer.MAX_VALUE;
this.editor = editor;
documentProvider = editor.getDocumentProvider();
}
@Override
public void reconcile(IRegion partition) {
try {
AutoconfParser parser = editor.getAutoconfParser();
((AutoconfErrorHandler)parser.getErrorHandler()).removeAllExistingMarkers();
((AutoconfErrorHandler) parser.getErrorHandler()).removeAllExistingMarkers();
editor.setRootElement(parser.parse(documentProvider.getDocument(editor.getEditorInput())));
outline.update();
} catch (Exception e) {

28
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/AutoconfSourceViewerConfiguration.java
View file

@ -29,19 +29,17 @@ import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
public class AutoconfSourceViewerConfiguration extends
TextSourceViewerConfiguration {
public class AutoconfSourceViewerConfiguration extends TextSourceViewerConfiguration {
private ITextHover acHover;
private IAnnotationHover aaHover;
private AutoconfEditor fEditor;
public AutoconfSourceViewerConfiguration(IPreferenceStore prefs, AutoconfEditor editor) {
super(prefs);
fEditor = editor;
}
@Override
public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
return AutoconfEditor.AUTOCONF_PARTITIONING;
@ -50,7 +48,7 @@ public class AutoconfSourceViewerConfiguration extends
@Override
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
ContentAssistant assistant = new ContentAssistant();
IContentAssistProcessor macroContentAssistProcessor = new AutoconfMacroContentAssistProcessor(fEditor);
assistant.setContentAssistProcessor(macroContentAssistProcessor, AutoconfPartitionScanner.AUTOCONF_MACRO);
assistant.setContentAssistProcessor(macroContentAssistProcessor, IDocument.DEFAULT_CONTENT_TYPE);
@ -59,38 +57,38 @@ public class AutoconfSourceViewerConfiguration extends
assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY);
assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
assistant.setInformationControlCreator(AutoconfTextHover.getInformationControlCreator());
return assistant;
}
@Override
public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
return new String[] { IDocument.DEFAULT_CONTENT_TYPE,
AutoconfPartitionScanner.AUTOCONF_MACRO,
AutoconfPartitionScanner.AUTOCONF_COMMENT};
return new String[] { IDocument.DEFAULT_CONTENT_TYPE, AutoconfPartitionScanner.AUTOCONF_MACRO,
AutoconfPartitionScanner.AUTOCONF_COMMENT };
}
@Override
public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
if (acHover == null)
acHover = new AutoconfTextHover(fEditor);
return acHover;
}
@Override
public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
if (aaHover == null)
aaHover = new AutoconfAnnotationHover();
return aaHover;
}
@Override
public IReconciler getReconciler(ISourceViewer sourceViewer) {
MonoReconciler reconciler= new MonoReconciler(new AutoconfReconcilingStrategy(fEditor), false);
MonoReconciler reconciler = new MonoReconciler(new AutoconfReconcilingStrategy(fEditor), false);
reconciler.setDelay(1000);
reconciler.setProgressMonitor(new NullProgressMonitor());
return reconciler;
}
@Override
public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
return new AutoconfPresentationReconciler();

5
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/IAutotoolsEditor.java
View file

@ -13,13 +13,12 @@ package org.eclipse.cdt.autotools.ui.editors;
import org.eclipse.cdt.internal.autotools.ui.editors.automake.IReconcilingParticipant;
import org.eclipse.ui.texteditor.ITextEditor;
public interface IAutotoolsEditor extends ITextEditor {
/**
* Adds the given listener.
* Has no effect if an identical listener was not already registered.
*
*
* @param listener The reconcile listener to be added
*/
void addReconcilingParticipant(IReconcilingParticipant listener);

29
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/InlineDataRule.java
View file

@ -49,11 +49,11 @@ public class InlineDataRule implements IRule {
protected boolean confirmDelimeter(ICharacterScanner scanner, char[] delimeter) {
int c = scanner.read();
StringBuilder buffer = new StringBuilder();
buffer.append((char)c);
buffer.append((char) c);
for (int i = 1; i < delimeter.length; ++i) {
if (c == delimeter[i]) {
c = scanner.read();
buffer.append((char)c);
buffer.append((char) c);
} else {
for (int j = buffer.length() - 1; j >= 0; j--)
scanner.unread();
@ -63,6 +63,7 @@ public class InlineDataRule implements IRule {
scanner.unread();
return true;
}
@Override
public IToken evaluate(ICharacterScanner scanner) {
int c = scanner.read();
@ -81,31 +82,29 @@ public class InlineDataRule implements IRule {
char[][] lineDelimeters = scanner.getLegalLineDelimiters();
StringBuilder endMarkerBuffer = new StringBuilder();
if (c == '-') {
fBuffer.append((char)c);
fBuffer.append((char) c);
c = scanner.read();
} else if (c == '\'') {
fBuffer.append((char)c);
fBuffer.append((char) c);
c = scanner.read();
}
while (c != ICharacterScanner.EOF &&
Character.isJavaIdentifierPart((char)c) &&
c != '\'') {
fBuffer.append((char)c);
endMarkerBuffer.append((char)c);
while (c != ICharacterScanner.EOF && Character.isJavaIdentifierPart((char) c) && c != '\'') {
fBuffer.append((char) c);
endMarkerBuffer.append((char) c);
c = scanner.read();
}
if (c == '\'') {
fBuffer.append((char)c);
fBuffer.append((char) c);
c = scanner.read();
}
if (endMarkerBuffer.length() == 0) {
unreadBuffer(scanner);
return Token.UNDEFINED;
}
// At this point we read until we find id by itself on its own line
boolean eol = false;
boolean finished = false;
@ -157,7 +156,7 @@ public class InlineDataRule implements IRule {
/**
* Returns the characters in the buffer to the scanner.
*
*
* @param scanner
* the scanner to be used
*/

5
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/MultilineRuleDamagerRepairer.java
View file

@ -20,8 +20,7 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.ITokenScanner;
public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
/**
* Creates a damager/repairer that uses the given scanner. The scanner may not be <code>null</code>
* and is assumed to return only token that carry text attributes.
@ -41,5 +40,5 @@ public class MultilineRuleDamagerRepairer extends DefaultDamagerRepairer {
// rule. It is easiest to just reparse the whole partition.
return partition;
}
}

13
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/ParseException.java
View file

@ -14,38 +14,47 @@
package org.eclipse.cdt.autotools.ui.editors;
public class ParseException extends Exception {
static final long serialVersionUID = 1;
String message;
int severity;
int lineNumber;
int startColumn;
int endColumn;
public int getEndColumn() {
return endColumn;
}
public void setEndColumn(int endColumn) {
this.endColumn = endColumn;
}
public int getLineNumber() {
return lineNumber;
}
public void setLineNumber(int lineNumber) {
this.lineNumber = lineNumber;
}
@Override
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public int getStartColumn() {
return startColumn;
}
public void setStartColumn(int startColumn) {
this.startColumn = startColumn;
}
public ParseException(String message, int lineNumber, int startColumn, int endColumn, int severity) {
super();
this.message = message;
@ -54,9 +63,11 @@ public class ParseException extends Exception {
this.endColumn = endColumn;
this.severity = severity;
}
public int getSeverity() {
return severity;
}
public void setSeverity(int severity) {
this.severity = severity;
}

28
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java
View file

@ -23,7 +23,7 @@ import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
public class RecursiveSingleLineRule extends SingleLineRule {
private List<IRule> rules;
private int evalIndex;
private int startIndex;
@ -31,6 +31,7 @@ public class RecursiveSingleLineRule extends SingleLineRule {
private int endBoundary;
private String startSequence;
private String endSequence;
/**
* Creates a rule for the given starting and ending sequence
* which, if detected, will return the specified token.
@ -72,7 +73,8 @@ public class RecursiveSingleLineRule extends SingleLineRule {
* @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
* @since 2.1
*/
public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF) {
public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter,
boolean breaksOnEOF) {
super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF);
this.startSequence = startSequence;
this.endSequence = endSequence;
@ -99,7 +101,8 @@ public class RecursiveSingleLineRule extends SingleLineRule {
* terminate the line, even if <code>breakOnEOL</code> is true
* @since 3.0
*/
public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOF, boolean escapeContinuesLine) {
public RecursiveSingleLineRule(String startSequence, String endSequence, IToken token, char escapeCharacter,
boolean breaksOnEOF, boolean escapeContinuesLine) {
super(startSequence, endSequence, token, escapeCharacter, breaksOnEOF, escapeContinuesLine);
this.startSequence = startSequence;
this.endSequence = endSequence;
@ -107,29 +110,29 @@ public class RecursiveSingleLineRule extends SingleLineRule {
startIndex = 0;
endIndex = 0;
}
public void addRule(SingleLineRule rule) {
rules.add(rule);
}
@Override
public IToken getSuccessToken() {
// We need to be aware of what success token we are referring to.
// The current internal rule index will help us determine which
// one.
if (evalIndex < rules.size()) {
SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
SingleLineRule x = (SingleLineRule) rules.get(evalIndex);
return x.getSuccessToken();
}
return super.getSuccessToken();
}
protected void backupScanner(ICharacterScanner scanner, int position) {
int count = scanner.getColumn() - position;
while (count-- > 0)
scanner.unread();
}
@Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
int column = scanner.getColumn();
@ -153,8 +156,7 @@ public class RecursiveSingleLineRule extends SingleLineRule {
// Back up scanner to just after start sequence.
backupScanner(scanner, startIndex + startSequence.length());
return super.getSuccessToken();
}
else
} else
// Outer rule doesn't hold.
return Token.UNDEFINED;
}
@ -163,12 +165,12 @@ public class RecursiveSingleLineRule extends SingleLineRule {
// At this point, we want to subdivide up the area covered by the
// outer rule into success tokens for internal areas separated by
// areas of the outer rule.
int start = scanner.getColumn();
column = start;
while (column < endBoundary) {
while (evalIndex < rules.size()) {
SingleLineRule x = (SingleLineRule)rules.get(evalIndex);
SingleLineRule x = (SingleLineRule) rules.get(evalIndex);
IToken token = x.evaluate(scanner, false);
if (!token.isUndefined()) {
// Found internal token. If we had to read to get
@ -190,7 +192,7 @@ public class RecursiveSingleLineRule extends SingleLineRule {
scanner.read();
++column;
}
// Outside internal area. Read until end of outer area and return
// outer token.
while (column++ < endIndex)

20
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/RestrictedEndOfLineRule.java
View file

@ -24,12 +24,13 @@ import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
public class RestrictedEndOfLineRule extends EndOfLineRule {
private List<IRule> rules;
private int startIndex;
private int endIndex;
private String startSequence;
private String restrictedChars;
/**
* Creates a rule for the given starting and ending sequence
* which, if detected, will return the specified token.
@ -71,7 +72,8 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
* @param breaksOnEOF indicates whether the end of the file successfully terminates this rule
* @since 2.1
*/
public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter, boolean breaksOnEOF) {
public RestrictedEndOfLineRule(String startSequence, String restrictedChars, IToken token, char escapeCharacter,
boolean breaksOnEOF) {
super(startSequence, token, escapeCharacter, breaksOnEOF);
this.startSequence = startSequence;
this.restrictedChars = restrictedChars;
@ -80,18 +82,16 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
endIndex = 0;
}
public void addRule(SingleLineRule rule) {
rules.add(rule);
}
protected void backupScanner(ICharacterScanner scanner, int position) {
int count = scanner.getColumn() - position;
while (count-- > 0)
scanner.unread();
}
@Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
int column = scanner.getColumn();
@ -108,21 +108,19 @@ public class RestrictedEndOfLineRule extends EndOfLineRule {
endIndex = scanner.getColumn();
// Back up scanner to just after start sequence.
backupScanner(scanner, startIndex + startSequence.length());
}
else
} else
// Base rule doesn't hold.
return Token.UNDEFINED;
}
// At this point, we want to check for restricted chars in the
// token. If we find them, we stop there.
int start = scanner.getColumn();
column = start;
while (column < endIndex) {
int ch = scanner.read();
if (ch == ICharacterScanner.EOF
|| restrictedChars.indexOf(ch) >= 0) {
if (ch == ICharacterScanner.EOF || restrictedChars.indexOf(ch) >= 0) {
scanner.unread();
return getSuccessToken();
}

31
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentOutlinePage.java
View file

@ -32,13 +32,12 @@ import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
public class AutoconfContentOutlinePage extends ContentOutlinePage {
private ITextEditor editor;
private IEditorInput input;
private LexicalSortingAction sortAction;
public AutoconfContentOutlinePage(AutoconfEditor editor) {
super();
this.editor = editor;
@ -50,14 +49,14 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
}
protected ISelection updateSelection(ISelection sel) {
ArrayList<AutoconfElement> newSelection= new ArrayList<>();
ArrayList<AutoconfElement> newSelection = new ArrayList<>();
if (sel instanceof IStructuredSelection) {
Iterator<?> iter = ((IStructuredSelection) sel).iterator();
for (;iter.hasNext();) {
for (; iter.hasNext();) {
//ICElement elem= fInput.findEqualMember((ICElement)iter.next());
Object o = iter.next();
if (o instanceof AutoconfElement) {
newSelection.add((AutoconfElement)o);
newSelection.add((AutoconfElement) o);
}
}
}
@ -69,11 +68,9 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
//update the tree viewer state
final TreeViewer viewer = getTreeViewer();
if (viewer != null)
{
if (viewer != null) {
final Control control = viewer.getControl();
if (control != null && !control.isDisposed())
{
if (control != null && !control.isDisposed()) {
control.getDisplay().asyncExec(() -> {
if (!control.isDisposed()) {
ISelection sel = viewer.getSelection();
@ -84,13 +81,13 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
}
}
}
@Override
public void createControl(Composite parent) {
super.createControl(parent);
TreeViewer viewer= getTreeViewer();
TreeViewer viewer = getTreeViewer();
viewer.setContentProvider(new AutoconfContentProvider(editor));
viewer.setLabelProvider(new AutoconfLabelProvider());
viewer.addSelectionChangedListener(this);
@ -100,23 +97,21 @@ public class AutoconfContentOutlinePage extends ContentOutlinePage {
}
sortAction.setTreeViewer(viewer);
}
/*
* Change in selection
*/
@Override
public void selectionChanged(SelectionChangedEvent event)
{
public void selectionChanged(SelectionChangedEvent event) {
super.selectionChanged(event);
//find out which item in tree viewer we have selected, and set highlight range accordingly
ISelection selection = event.getSelection();
if (selection.isEmpty()) {
editor.resetHighlightRange();
} else {
AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection)
.getFirstElement();
AutoconfElement element = (AutoconfElement) ((IStructuredSelection) selection).getFirstElement();
try {
int offset = element.getStartOffset();
int length = element.getEndOffset() - offset;

30
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfContentProvider.java
View file

@ -24,21 +24,20 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
public class AutoconfContentProvider implements ITreeContentProvider {
private IDocumentProvider documentProvider;
private AutoconfEditor editor;
protected final static String SECTION_POSITIONS = "section_positions";
protected IPositionUpdater positionUpdater = new DefaultPositionUpdater(SECTION_POSITIONS);
public AutoconfContentProvider(ITextEditor editor) {
if (editor instanceof AutoconfEditor) {
this.editor = (AutoconfEditor) editor;
}
this.documentProvider = editor.getDocumentProvider();
}
@Override
public void dispose() {
// TODO Auto-generated method stub
@ -47,27 +46,20 @@ public class AutoconfContentProvider implements ITreeContentProvider {
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (oldInput != null)
{
if (oldInput != null) {
IDocument document = documentProvider.getDocument(oldInput);
if (document != null)
{
try
{
if (document != null) {
try {
document.removePositionCategory(SECTION_POSITIONS);
}
catch (BadPositionCategoryException x)
{
} catch (BadPositionCategoryException x) {
}
document.removePositionUpdater(positionUpdater);
}
}
if (newInput != null)
{
if (newInput != null) {
IDocument document = documentProvider.getDocument(newInput);
if (document != null)
{
if (document != null) {
document.addPositionCategory(SECTION_POSITIONS);
document.addPositionUpdater(positionUpdater);
}
@ -77,7 +69,7 @@ public class AutoconfContentProvider implements ITreeContentProvider {
@Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof AutoconfElement) {
AutoconfElement element = (AutoconfElement)parentElement;
AutoconfElement element = (AutoconfElement) parentElement;
return element.getChildren();
}
return new Object[0];
@ -91,8 +83,8 @@ public class AutoconfContentProvider implements ITreeContentProvider {
@Override
public boolean hasChildren(Object element) {
if (element instanceof AutoconfElement) {
return ((AutoconfElement)element).hasChildren();
}
return ((AutoconfElement) element).hasChildren();
}
return false;
}

9
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/outline/AutoconfLabelProvider.java
View file

@ -31,13 +31,12 @@ import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.swt.graphics.Image;
public class AutoconfLabelProvider implements ILabelProvider {
public AutoconfLabelProvider() {
super();
}
@Override
public void addListener(ILabelProviderListener listener) {
}
@ -72,9 +71,9 @@ public class AutoconfLabelProvider implements ILabelProvider {
else if (element instanceof AutoconfWhileElement)
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE);
else if (element instanceof AutoconfUntilElement)
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE); // TODO
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE); // TODO
else if (element instanceof AutoconfSelectElement)
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE); // TODO
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_WHILE); // TODO
else if (element instanceof AutoconfMacroElement)
return AutotoolsUIPluginImages.get(AutotoolsUIPluginImages.IMG_OBJS_ACMACRO);
else if (element instanceof AutoconfMacroArgumentElement)
@ -85,7 +84,7 @@ public class AutoconfLabelProvider implements ILabelProvider {
@Override
public String getText(Object element) {
if (element instanceof AutoconfElement) {
AutoconfElement e = (AutoconfElement)element;
AutoconfElement e = (AutoconfElement) element;
String result;
String name = e.getName();
if (name.length() > 31)

4
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseConditionElement.java
View file

@ -14,11 +14,11 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfCaseConditionElement extends AutoconfElement {
public AutoconfCaseConditionElement() {
super("");
}
public AutoconfCaseConditionElement(String name) {
super(name);
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfCaseElement.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfCaseElement extends AutoconfElement {
public AutoconfCaseElement() {
super("case"); //$NON-NLS-1$
}

38
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElement.java
View file

@ -20,7 +20,7 @@ import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
public class AutoconfElement {
protected String name;
protected String var;
protected int startOffset;
@ -28,18 +28,17 @@ public class AutoconfElement {
protected List<AutoconfElement> children;
protected AutoconfElement parent;
private IDocument document;
public AutoconfElement(String name) {
this(name, null);
}
public AutoconfElement(String name, String var) {
this.name = name;
this.var = var;
this.startOffset = 0;
this.children = new ArrayList<>();
}
@Override
public String toString() {
@ -54,35 +53,35 @@ public class AutoconfElement {
}
return getClass().getSimpleName() + ": '" + source + "'"; //$NON-NLS-1$ //$NON-NLS-2$
}
public void addChild(AutoconfElement element) {
children.add(element);
if (element.getParent() == null)
element.setParent(this);
}
public void addSibling(AutoconfElement element) {
parent.addChild(element);
}
public AutoconfElement getLastChild() {
if (hasChildren())
return children.get(children.size() - 1);
return null;
}
public AutoconfElement getParent() {
return parent;
}
public void setParent(AutoconfElement parent) {
this.parent = parent;
}
public AutoconfElement[] getChildren() {
return children.toArray(new AutoconfElement[children.size()]);
}
public boolean hasChildren() {
return !children.isEmpty();
}
@ -90,40 +89,39 @@ public class AutoconfElement {
public String getName() {
return name;
}
public void setName(String string) {
this.name = string;
}
public String getVar() {
return var;
}
public void setVar(String value) {
var = value;
}
public void setDocument(IDocument document) {
this.document = document;
}
public IDocument getDocument() {
return document;
}
public void setStartOffset(int offset) {
this.startOffset = offset;
}
public int getStartOffset() {
return startOffset;
}
public void setEndOffset(int offset) {
this.endOffset = offset;
}
public int getEndOffset() {
return endOffset;
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElifElement.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfElifElement extends AutoconfElement {
public AutoconfElifElement() {
super("elif"); //$NON-NLS-1$
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfElseElement.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfElseElement extends AutoconfElement {
public AutoconfElseElement() {
super("else"); //$NON-NLS-1$
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfForElement.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfForElement extends AutoconfElement {
public AutoconfForElement() {
super("for"); //$NON-NLS-1$
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfIfElement.java
View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.autotools.ui.editors.parser;
public class AutoconfIfElement extends AutoconfElement {
public AutoconfIfElement() {
super("if"); //$NON-NLS-1$
}

1
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroArgumentElement.java
View file

@ -26,6 +26,7 @@ public class AutoconfMacroArgumentElement extends AutoconfElement {
public AutoconfMacroArgumentElement() {
super(""); // //$NON-NLS-N$
}
public AutoconfMacroArgumentElement(String name) {
super(name);
}

2
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/autotools/ui/editors/parser/AutoconfMacroDetector.java
View file

@ -20,7 +20,7 @@ import java.util.regex.Pattern;
public class AutoconfMacroDetector implements IAutoconfMacroDetector {
private static final Pattern AUTOCONF_MACRO_PATTERN = Pattern.compile("PKG_.*|AC_.*|AM_.*|m4.*"); //$NON-NLS-1$
@Override
public boolean isMacroIdentifier(String name) {
return AUTOCONF_MACRO_PATTERN.matcher(name).matches();

Some files were not shown because too many files have changed in this diff Show more