From e7c1ecb1e6de811843afaac78ad370a67b69563e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 8 Dec 2009 12:52:32 +0000 Subject: 2009-12-08 Sebastian Huber * src/org/rtems/cdt/Activator.java, src/org/rtems/cdt/Constants.java, src/org/rtems/cdt/Storage.java, src/org/rtems/cdt/VolatilePreferenceStore.java, src/org/rtems/cdt/build/CommandLineGenerator.java, src/org/rtems/cdt/build/CygwinScannerInfoCollector.java, src/org/rtems/cdt/build/EnvironmentSupplier.java, src/org/rtems/cdt/build/RunScannerInfoProvider.java, src/org/rtems/cdt/preferences/PreferenceInitializer.java, src/org/rtems/cdt/preferences/PreferencePage.java, src/org/rtems/cdt/properties/PropertyPage.java, src/org/rtems/cdt/wizards/BasicSetup.java, src/org/rtems/cdt/wizards/FinishSetup.java: Replaced '( ' with '('. --- org.rtems.cdt/src/org/rtems/cdt/Activator.java | 12 +- org.rtems.cdt/src/org/rtems/cdt/Constants.java | 6 +- org.rtems.cdt/src/org/rtems/cdt/Storage.java | 218 ++++++++++----------- .../src/org/rtems/cdt/VolatilePreferenceStore.java | 2 +- .../org/rtems/cdt/build/CommandLineGenerator.java | 28 +-- .../cdt/build/CygwinScannerInfoCollector.java | 20 +- .../org/rtems/cdt/build/EnvironmentSupplier.java | 14 +- .../rtems/cdt/build/RunScannerInfoProvider.java | 10 +- .../cdt/preferences/PreferenceInitializer.java | 14 +- .../org/rtems/cdt/preferences/PreferencePage.java | 10 +- .../src/org/rtems/cdt/properties/PropertyPage.java | 36 ++-- .../src/org/rtems/cdt/wizards/BasicSetup.java | 86 ++++---- .../src/org/rtems/cdt/wizards/FinishSetup.java | 6 +- 13 files changed, 231 insertions(+), 231 deletions(-) diff --git a/org.rtems.cdt/src/org/rtems/cdt/Activator.java b/org.rtems.cdt/src/org/rtems/cdt/Activator.java index 810e356..f9e8f35 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/Activator.java +++ b/org.rtems.cdt/src/org/rtems/cdt/Activator.java @@ -32,15 +32,15 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { private static Activator mPlugin; - public void start( BundleContext context) throws Exception { - super.start( context); + public void start(BundleContext context) throws Exception { + super.start(context); mPlugin = this; createBSPInfoMakefile(); } - public void stop( BundleContext context) throws Exception { + public void stop(BundleContext context) throws Exception { mPlugin = null; - super.stop( context); + super.stop(context); } public static Activator getDefault() { @@ -52,10 +52,10 @@ public class Activator extends AbstractUIPlugin { } private void createBSPInfoMakefile() { - IPath makefile = getMakefileLocation().append( "Makefile"); + IPath makefile = getMakefileLocation().append("Makefile"); BufferedWriter out = null; try { - out = new BufferedWriter( new FileWriter( makefile.toFile())); + out = new BufferedWriter(new FileWriter(makefile.toFile())); out.write( "include $(" + Constants.BSP_PATH_MAKE_VARIABLE + ")/Makefile.inc\n" + "include $(RTEMS_CUSTOM)\n" diff --git a/org.rtems.cdt/src/org/rtems/cdt/Constants.java b/org.rtems.cdt/src/org/rtems/cdt/Constants.java index fec286b..8a128f0 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/Constants.java +++ b/org.rtems.cdt/src/org/rtems/cdt/Constants.java @@ -27,7 +27,7 @@ import java.util.Map; import org.eclipse.core.runtime.Platform; public class Constants { - public static final String PATH_SEPARATOR = System.getProperty( "path.separator"); + public static final String PATH_SEPARATOR = System.getProperty("path.separator"); public static final String PATH_VARIABLE_NAME = getPathVariableName(); @@ -104,7 +104,7 @@ public class Constants { private static String getPathVariableName() { Map env = System.getenv(); for (String name : env.keySet()) { - if (name.equalsIgnoreCase( "PATH")) { + if (name.equalsIgnoreCase("PATH")) { return name; } } @@ -113,7 +113,7 @@ public class Constants { } private static String getDefaultPath() { - if (Platform.getOS().equals( Platform.OS_WIN32)) { + if (Platform.getOS().equals(Platform.OS_WIN32)) { return "C:\\"; } else { return "/opt/rtems-4.9"; diff --git a/org.rtems.cdt/src/org/rtems/cdt/Storage.java b/org.rtems.cdt/src/org/rtems/cdt/Storage.java index e0cc1a5..6827c8d 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/Storage.java +++ b/org.rtems.cdt/src/org/rtems/cdt/Storage.java @@ -60,15 +60,15 @@ public class Storage { private static final int TOOL_COMPLETE = 3; - public static String getPreference( String key) { - return Activator.getDefault().getPreferenceStore().getString( key); + public static String getPreference(String key) { + return Activator.getDefault().getPreferenceStore().getString(key); } - public static String getPristineProperty( IProject project, String key) { + public static String getPristineProperty(IProject project, String key) { String value = null; try { - value = project.getPersistentProperty( new QualifiedName( "", key)); + value = project.getPersistentProperty(new QualifiedName("", key)); } catch (CoreException e) { e.printStackTrace(); } @@ -76,51 +76,51 @@ public class Storage { return value; } - public static String getProperty( IProject project, String key) { - String value = getPristineProperty( project, key); + public static String getProperty(IProject project, String key) { + String value = getPristineProperty(project, key); if (value == null) { - if (key.startsWith( Constants.TOOL_KEY_PREFIX)) { - changePlatform( project, Constants.PLATFORM_DEFAULT); + if (key.startsWith(Constants.TOOL_KEY_PREFIX)) { + changePlatform(project, Constants.PLATFORM_DEFAULT); } else { - value = getPreference( key); - setProperty( project, key, value); + value = getPreference(key); + setProperty(project, key, value); } } return value; } - public static void setProperty( IProject project, String key, String value) { + public static void setProperty(IProject project, String key, String value) { try { - project.setPersistentProperty( new QualifiedName( "", key), value); + project.setPersistentProperty(new QualifiedName("", key), value); } catch (CoreException e) { e.printStackTrace(); } } - public static IConfiguration [] getConfigurations( IProject project) { - ICProjectDescription pd = CoreModel.getDefault().getProjectDescription( project); + public static IConfiguration [] getConfigurations(IProject project) { + ICProjectDescription pd = CoreModel.getDefault().getProjectDescription(project); ICConfigurationDescription cds [] = pd.getConfigurations(); IConfiguration cfgs [] = new IConfiguration [cds.length]; for (int i = 0; i < cds.length; ++i) { - cfgs [i] = ManagedBuildManager.getConfigurationForDescription( cds [i]); + cfgs [i] = ManagedBuildManager.getConfigurationForDescription(cds [i]); } return cfgs; } - public static IConfiguration getActiveConfiguration( IProject project) { - ICProjectDescription pd = CoreModel.getDefault().getProjectDescription( project); + public static IConfiguration getActiveConfiguration(IProject project) { + ICProjectDescription pd = CoreModel.getDefault().getProjectDescription(project); ICConfigurationDescription cd = pd.getActiveConfiguration(); - IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription( cd); + IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cd); return cfg; } - public static String prependToPath( String path, String part) { + public static String prependToPath(String path, String part) { if (path == null || path.length()==0) { return part; } else { @@ -128,52 +128,52 @@ public class Storage { } } - public static String prependToPathByPreference( String path, String key) { - String basePath = getPreference( key); + public static String prependToPathByPreference(String path, String key) { + String basePath = getPreference(key); if (basePath != null) { - IPath part = new Path( basePath).append( "bin"); + IPath part = new Path(basePath).append("bin"); - return prependToPath( path, part.toOSString()); + return prependToPath(path, part.toOSString()); } return path; } - public static String prependToPathByProperty( IProject project, String path, String key) { - String basePath = getProperty( project, key); + public static String prependToPathByProperty(IProject project, String path, String key) { + String basePath = getProperty(project, key); if (basePath != null) { - IPath part = new Path( basePath).append( "bin"); + IPath part = new Path(basePath).append("bin"); - return prependToPath( path, part.toOSString()); + return prependToPath(path, part.toOSString()); } return path; } - public static String getPlatform( IProject project) { - return getPristineProperty( project, Constants.PLATFORM_KEY); + public static String getPlatform(IProject project) { + return getPristineProperty(project, Constants.PLATFORM_KEY); } - public static void setPlatform( IProject project, String platform) { - setProperty( project, Constants.PLATFORM_KEY, platform); + public static void setPlatform(IProject project, String platform) { + setProperty(project, Constants.PLATFORM_KEY, platform); } - public static void clearPlatform( IProject project) { - setPlatform( project, null); + public static void clearPlatform(IProject project) { + setPlatform(project, null); // Delete discovered paths for all configurations of the project - for (IConfiguration cfg : getConfigurations( project)) { + for (IConfiguration cfg : getConfigurations(project)) { CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo( project, - new CfgInfoContext( cfg) + new CfgInfoContext(cfg) ); } } - public static void changePlatform( IProject project, String newPlatform) { - String platform = getPlatform( project); + public static void changePlatform(IProject project, String newPlatform) { + String platform = getPlatform(project); // Check if we have already the requested platform if (platform != null && platform == newPlatform) { @@ -182,74 +182,74 @@ public class Storage { } // Set new platform - setPlatform( project, newPlatform); + setPlatform(project, newPlatform); // Update path prepends String path = null; - if (Platform.getOS().equals( Platform.OS_WIN32)) { - if (newPlatform.equals( Constants.PLATFORM_CYGWIN)) { - path = prependToPathByPreference( path, Constants.CYGWIN_PATH_KEY); + if (Platform.getOS().equals(Platform.OS_WIN32)) { + if (newPlatform.equals(Constants.PLATFORM_CYGWIN)) { + path = prependToPathByPreference(path, Constants.CYGWIN_PATH_KEY); } else { - path = prependToPathByPreference( path, Constants.MINGW_PATH_KEY); - path = prependToPathByPreference( path, Constants.MSYS_PATH_KEY); + path = prependToPathByPreference(path, Constants.MINGW_PATH_KEY); + path = prependToPathByPreference(path, Constants.MSYS_PATH_KEY); } } - path = prependToPathByProperty( project, path, Constants.BASE_PATH_KEY); - setProperty( project, Constants.PATH_PREPEND_KEY, path); + path = prependToPathByProperty(project, path, Constants.BASE_PATH_KEY); + setProperty(project, Constants.PATH_PREPEND_KEY, path); // Update tools - updateTools( project, newPlatform); + updateTools(project, newPlatform); } - private static void updateTools( IProject project, String platform) { - String bspPath = getProperty( project, Constants.BSP_PATH_KEY); - IPath make = new Path( "make"); + private static void updateTools(IProject project, String platform) { + String bspPath = getProperty(project, Constants.BSP_PATH_KEY); + IPath make = new Path("make"); List options = new LinkedList(); boolean error = false; // Set tools to default values - updateTool( project, Constants.TOOL_ARCHIVER_KEY, "ar", options); - updateTool( project, Constants.TOOL_ASSEMBLER_KEY, "as", options); - updateTool( project, Constants.TOOL_COMPILER_CPP_KEY, "g++", options); - updateTool( project, Constants.TOOL_COMPILER_C_KEY, "gcc", options); - updateTool( project, Constants.TOOL_LINKER_CPP_KEY, "g++", options); - updateTool( project, Constants.TOOL_LINKER_C_KEY, "gcc", options); + updateTool(project, Constants.TOOL_ARCHIVER_KEY, "ar", options); + updateTool(project, Constants.TOOL_ASSEMBLER_KEY, "as", options); + updateTool(project, Constants.TOOL_COMPILER_CPP_KEY, "g++", options); + updateTool(project, Constants.TOOL_COMPILER_C_KEY, "gcc", options); + updateTool(project, Constants.TOOL_LINKER_CPP_KEY, "g++", options); + updateTool(project, Constants.TOOL_LINKER_C_KEY, "gcc", options); // Delete markers for this unit - deleteMarkers( project, Constants.MARKER_ID_TOOL_DISCOVERY); + deleteMarkers(project, Constants.MARKER_ID_TOOL_DISCOVERY); // Translate path if necessary - if (Platform.getOS().equals( Platform.OS_WIN32)) { - if (platform.equals( Constants.PLATFORM_CYGWIN)) { - String s [] = bspPath.split( ":"); + if (Platform.getOS().equals(Platform.OS_WIN32)) { + if (platform.equals(Constants.PLATFORM_CYGWIN)) { + String s [] = bspPath.split(":"); if (s.length > 0) { - bspPath = bspPath.replaceFirst( "^" + s [0] + ":", "/cygdrive/" + s [0]); + bspPath = bspPath.replaceFirst("^" + s [0] + ":", "/cygdrive/" + s [0]); } } - bspPath = bspPath.replaceAll( "\\\\", "/"); + bspPath = bspPath.replaceAll("\\\\", "/"); } // Create make process builder ProcessBuilder pb = new ProcessBuilder(); // Change working directory to the Makefile location - pb.directory( Activator.getDefault().getMakefileLocation().toFile()); + pb.directory(Activator.getDefault().getMakefileLocation().toFile()); // Update path environment variable Map env = pb.environment(); - String path = env.get( Constants.PATH_VARIABLE_NAME); - String part = getProperty( project, Constants.PATH_PREPEND_KEY); - path = Storage.prependToPath( path, part); - env.put( Constants.PATH_VARIABLE_NAME, path); + String path = env.get(Constants.PATH_VARIABLE_NAME); + String part = getProperty(project, Constants.PATH_PREPEND_KEY); + path = Storage.prependToPath(path, part); + env.put(Constants.PATH_VARIABLE_NAME, path); // On Windows we have to search for the make program in the new path environment - if (Platform.getOS().equals( Platform.OS_WIN32)) { - String parts [] = path.split( Constants.PATH_SEPARATOR); + if (Platform.getOS().equals(Platform.OS_WIN32)) { + String parts [] = path.split(Constants.PATH_SEPARATOR); boolean found = false; for (String p : parts) { - IPath makeCandidate = new Path( p).append( "make.exe"); - File file = new File( makeCandidate.toOSString()); + IPath makeCandidate = new Path(p).append("make.exe"); + File file = new File(makeCandidate.toOSString()); if (file.exists()) { make = makeCandidate; @@ -268,7 +268,7 @@ public class Storage { } // Set command line - String makeArgument = Constants.BSP_PATH_MAKE_VARIABLE + "=" + bspPath.replaceAll( " ", "\\\\ "); + String makeArgument = Constants.BSP_PATH_MAKE_VARIABLE + "=" + bspPath.replaceAll(" ", "\\\\ "); pb.command( make.toOSString(), makeArgument @@ -279,7 +279,7 @@ public class Storage { try { p = pb.start(); InputStream is = p.getInputStream(); - BufferedReader br = new BufferedReader( new InputStreamReader( is)); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); String line = br.readLine(); String key = null; String command = null; @@ -287,19 +287,19 @@ public class Storage { while (line != null) { switch (state) { case EXPECT_OPTION: - if (line.startsWith( VALUE_START_TOKEN)) { - options.add( line.substring( 1)); + if (line.startsWith(VALUE_START_TOKEN)) { + options.add(line.substring(1)); } else { state = TOOL_COMPLETE; continue; } break; case EXPECT_COMMAND: - if (line.startsWith( VALUE_START_TOKEN)) { - command = line.substring( 1); + if (line.startsWith(VALUE_START_TOKEN)) { + command = line.substring(1); state = EXPECT_OPTION; } else { - throw new IOException( "unexpected line format"); + throw new IOException("unexpected line format"); } break; case EXPECT_KEY: @@ -307,21 +307,21 @@ public class Storage { key = line; state = EXPECT_COMMAND; } else { - throw new IOException( "unexpected line format"); + throw new IOException("unexpected line format"); } break; case TOOL_COMPLETE: - updateTool( project, key, command, options); + updateTool(project, key, command, options); options.clear(); state = EXPECT_KEY; continue; default: - throw new IOException( "unexpected state"); + throw new IOException("unexpected state"); } line = br.readLine(); } if (state == EXPECT_OPTION) { - updateTool( project, key, command, options); + updateTool(project, key, command, options); } } catch (IOException e) { error = true; @@ -356,18 +356,18 @@ public class Storage { // Check error if (error) { // Clear platform to trigger an update again if someone changed a preference or property value - setPlatform( project, null); + setPlatform(project, null); } } - private static void updateTool( IProject project, String toolKey, String command, List options) { + private static void updateTool(IProject project, String toolKey, String command, List options) { List filteredOptions = new LinkedList(); // Filter options - if (toolKey.startsWith( Constants.COMPILER_KEY_PREFIX) || toolKey.startsWith( Constants.LINKER_KEY_PREFIX)) { + if (toolKey.startsWith(Constants.COMPILER_KEY_PREFIX) || toolKey.startsWith(Constants.LINKER_KEY_PREFIX)) { for (String option : options) { - if (!(option.length() == 0 || option.trim().matches( "^(-c|-O[0123s]|-g.*|-W[\\w-]*|[-]*pipe)$"))) { - filteredOptions.add( option); + if (!(option.length() == 0 || option.trim().matches("^(-c|-O[0123s]|-g.*|-W[\\w-]*|[-]*pipe)$"))) { + filteredOptions.add(option); } } } else { @@ -377,11 +377,11 @@ public class Storage { // Transform filtered option list into option string value String optionsValue = new String(); if (!options.isEmpty()) { - optionsValue = filteredOptions.get( 0); - filteredOptions.remove( 0); + optionsValue = filteredOptions.get(0); + filteredOptions.remove(0); } for (String option : filteredOptions) { - if (option.indexOf( ' ') != -1) { + if (option.indexOf(' ') != -1) { option = "\"" + option + "\""; } optionsValue += OPTION_SEPARATOR + option; @@ -391,49 +391,49 @@ public class Storage { // It is also a workaround for the internal builder since this one does not care about // the environment provider to fix the $PATH. IPath commandPath = new Path( - Storage.getProperty( project, Constants.BASE_PATH_KEY) + Storage.getProperty(project, Constants.BASE_PATH_KEY) ) - .append( "bin") - .append( command); + .append("bin") + .append(command); command = commandPath.toString(); // Set properties - setProperty( project, toolKey, command); - setProperty( project, toolKey + Constants.TOOL_OPTIONS_KEY_POSTFIX, optionsValue); + setProperty(project, toolKey, command); + setProperty(project, toolKey + Constants.TOOL_OPTIONS_KEY_POSTFIX, optionsValue); } - public static String [] getToolOptions( IProject project, String toolKey) { - String optionsValue = getProperty( project, toolKey + Constants.TOOL_OPTIONS_KEY_POSTFIX); + public static String [] getToolOptions(IProject project, String toolKey) { + String optionsValue = getProperty(project, toolKey + Constants.TOOL_OPTIONS_KEY_POSTFIX); - return optionsValue.split( OPTION_SEPARATOR); + return optionsValue.split(OPTION_SEPARATOR); } - public static boolean areToolOptionsEnabled( IProject project) { - return !getProperty( project, Constants.DISABLE_TOOL_OPTIONS_KEY).equals( "true"); + public static boolean areToolOptionsEnabled(IProject project) { + return !getProperty(project, Constants.DISABLE_TOOL_OPTIONS_KEY).equals("true"); } - public static void createMarker( IProject project, String id, String message) { - createMarker( project, id, message, IMarker.SEVERITY_ERROR); + public static void createMarker(IProject project, String id, String message) { + createMarker(project, id, message, IMarker.SEVERITY_ERROR); } - public static void createMarker( IProject project, String id, String message, int severity) { + public static void createMarker(IProject project, String id, String message, int severity) { try { - IMarker marker = project.createMarker( IMarker.PROBLEM); - marker.setAttribute( IMarker.LOCATION, id); - marker.setAttribute( IMarker.MESSAGE, message); - marker.setAttribute( IMarker.SEVERITY, severity); + IMarker marker = project.createMarker(IMarker.PROBLEM); + marker.setAttribute(IMarker.LOCATION, id); + marker.setAttribute(IMarker.MESSAGE, message); + marker.setAttribute(IMarker.SEVERITY, severity); } catch (CoreException e) { e.printStackTrace(); } } - public static void deleteMarkers( IProject project, String id) { + public static void deleteMarkers(IProject project, String id) { try { - IMarker[] markers = project.findMarkers( IMarker.PROBLEM, true, IResource.DEPTH_INFINITE); + IMarker[] markers = project.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE); if (markers != null) { for (IMarker m : markers) { - if (m.getResource().equals( project) && m.getAttribute( IMarker.LOCATION, "").equals( id)) { + if (m.getResource().equals(project) && m.getAttribute(IMarker.LOCATION, "").equals(id)) { m.delete(); } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/VolatilePreferenceStore.java b/org.rtems.cdt/src/org/rtems/cdt/VolatilePreferenceStore.java index 019a23c..db2a8e5 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/VolatilePreferenceStore.java +++ b/org.rtems.cdt/src/org/rtems/cdt/VolatilePreferenceStore.java @@ -31,7 +31,7 @@ public class VolatilePreferenceStore extends PreferenceStore implements IPrefere // Do nothing } - public void save( OutputStream out, String header) { + public void save(OutputStream out, String header) { // Do nothing } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java index d64af68..a3f551f 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java @@ -49,37 +49,37 @@ public class CommandLineGenerator extends ManagedCommandLineGenerator implements IProject project = (IProject) tool.getParentResourceInfo().getParent().getOwner(); // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Determine tool key via the tool ID String id = tool.getId(); String toolKey = "gcc"; - if (id.contains( "archiver")) { + if (id.contains("archiver")) { toolKey = Constants.TOOL_ARCHIVER_KEY; - } else if (id.contains( "assembler.gcc")) { + } else if (id.contains("assembler.gcc")) { toolKey = Constants.TOOL_COMPILER_C_KEY; - } else if (id.contains( "assembler")) { + } else if (id.contains("assembler")) { toolKey = Constants.TOOL_ASSEMBLER_KEY; - } else if (id.contains( "compiler.cpp")) { + } else if (id.contains("compiler.cpp")) { toolKey = Constants.TOOL_COMPILER_CPP_KEY; - } else if (id.contains( "compiler.c")) { + } else if (id.contains("compiler.c")) { toolKey = Constants.TOOL_COMPILER_C_KEY; - } else if (id.contains( "linker.cpp")) { + } else if (id.contains("linker.cpp")) { toolKey = Constants.TOOL_LINKER_CPP_KEY; - } else if (id.contains( "linker.c")) { + } else if (id.contains("linker.c")) { toolKey = Constants.TOOL_LINKER_C_KEY; } // Set command name - commandName = Storage.getProperty( project, toolKey); - tool.setToolCommand( commandName); + commandName = Storage.getProperty(project, toolKey); + tool.setToolCommand(commandName); // Combine tool options and options - if (Storage.areToolOptionsEnabled( project)) { - String [] toolOptions = Storage.getToolOptions( project, toolKey); + if (Storage.areToolOptionsEnabled(project)) { + String [] toolOptions = Storage.getToolOptions(project, toolKey); String combinedOptions [] = new String [toolOptions.length + options.length]; - System.arraycopy( toolOptions, 0, combinedOptions, 0, toolOptions.length); - System.arraycopy( options, 0, combinedOptions, toolOptions.length, options.length); + System.arraycopy(toolOptions, 0, combinedOptions, 0, toolOptions.length); + System.arraycopy(options, 0, combinedOptions, toolOptions.length, options.length); options = combinedOptions; } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java b/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java index a67a718..99f0da9 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/CygwinScannerInfoCollector.java @@ -42,29 +42,29 @@ import org.eclipse.core.resources.IProject; public class CygwinScannerInfoCollector extends PerProjectSICollector implements IScannerInfoCollector3, IManagedScannerInfoCollector { private IProject mProject; - public void contributeToScannerConfig( Object resource, Map scannerInfo) { - List includes = (List) scannerInfo.get( ScannerInfoTypes.INCLUDE_PATHS); - List translatedIncludes = CygpathTranslator.translateIncludePaths( mProject, includes); + public void contributeToScannerConfig(Object resource, Map scannerInfo) { + List includes = (List) scannerInfo.get(ScannerInfoTypes.INCLUDE_PATHS); + List translatedIncludes = CygpathTranslator.translateIncludePaths(mProject, includes); Iterator iter = translatedIncludes.listIterator(); while (iter.hasNext()) { String convertedPath = iter.next(); - if (convertedPath.startsWith( "/")) { + if (convertedPath.startsWith("/")) { iter.remove(); } } - scannerInfo.put( ScannerInfoTypes.INCLUDE_PATHS, translatedIncludes); + scannerInfo.put(ScannerInfoTypes.INCLUDE_PATHS, translatedIncludes); - super.contributeToScannerConfig( resource, scannerInfo); + super.contributeToScannerConfig(resource, scannerInfo); } - public void setProject( IProject project) { + public void setProject(IProject project) { mProject = project; - super.setProject( project); + super.setProject(project); } - public void setInfoContext( InfoContext context) { + public void setInfoContext(InfoContext context) { mProject = context.getProject(); - super.setInfoContext( context); + super.setInfoContext(context); } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java b/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java index 80f88b2..00f880f 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/EnvironmentSupplier.java @@ -40,26 +40,26 @@ public class EnvironmentSupplier implements IConfigurationEnvironmentVariableSup return Constants.PLATFORM_DEFAULT; } - public IBuildEnvironmentVariable getVariable( String name, IConfiguration configuration, IEnvironmentVariableProvider provider) { - if (name.equals( "PATH")) { + public IBuildEnvironmentVariable getVariable(String name, IConfiguration configuration, IEnvironmentVariableProvider provider) { + if (name.equals("PATH")) { IProject project = (IProject) configuration.getOwner(); // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Get path parts - String part = Storage.getProperty( project, Constants.PATH_PREPEND_KEY); + String part = Storage.getProperty(project, Constants.PATH_PREPEND_KEY); - return new BuildEnvVar( name, part, IBuildEnvironmentVariable.ENVVAR_PREPEND, Constants.PATH_SEPARATOR); + return new BuildEnvVar(name, part, IBuildEnvironmentVariable.ENVVAR_PREPEND, Constants.PATH_SEPARATOR); } return null; } - public IBuildEnvironmentVariable [] getVariables( IConfiguration configuration, IEnvironmentVariableProvider provider) { + public IBuildEnvironmentVariable [] getVariables(IConfiguration configuration, IEnvironmentVariableProvider provider) { IBuildEnvironmentVariable variables [] = new IBuildEnvironmentVariable [VARIABLE_COUNT]; - variables [PATH_INDEX] = getVariable( "PATH", configuration, provider); + variables [PATH_INDEX] = getVariable("PATH", configuration, provider); return variables; } diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java b/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java index 93c67fd..5adbe42 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/RunScannerInfoProvider.java @@ -57,18 +57,18 @@ public class RunScannerInfoProvider extends GCCSpecsRunSIProvider { } // Change platform - Storage.changePlatform( project, getPlatform()); + Storage.changePlatform(project, getPlatform()); // Set compile command fCompileCommand = new Path( - Storage.getProperty( project, Constants.TOOL_COMPILER_C_KEY) + Storage.getProperty(project, Constants.TOOL_COMPILER_C_KEY) ); // Add the standard options to the command arguments - String options [] = Storage.getToolOptions( project, Constants.TOOL_COMPILER_C_KEY); + String options [] = Storage.getToolOptions(project, Constants.TOOL_COMPILER_C_KEY); String newCompileArguments [] = new String [options.length + fCompileArguments.length]; - System.arraycopy( options, 0, newCompileArguments, 0, options.length); - System.arraycopy( fCompileArguments, 0, newCompileArguments, options.length, fCompileArguments.length); + System.arraycopy(options, 0, newCompileArguments, 0, options.length); + System.arraycopy(fCompileArguments, 0, newCompileArguments, options.length, fCompileArguments.length); fCompileArguments = newCompileArguments; return true; diff --git a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferenceInitializer.java b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferenceInitializer.java index e14f6bf..4f8a1a7 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferenceInitializer.java +++ b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferenceInitializer.java @@ -31,13 +31,13 @@ import org.rtems.cdt.Constants; public class PreferenceInitializer extends AbstractPreferenceInitializer { public void initializeDefaultPreferences() { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); - store.setDefault( Constants.BASE_PATH_KEY, Constants.DEFAULT_BASE_PATH); - store.setDefault( Constants.BSP_PATH_KEY, Constants.DEFAULT_BSP_PATH); - if (Platform.getOS().equals( Platform.OS_WIN32)) { - store.setDefault( Constants.CYGWIN_PATH_KEY, Constants.DEFAULT_CYGWIN_PATH); - store.setDefault( Constants.MINGW_PATH_KEY, Constants.DEFAULT_MINGW_PATH); - store.setDefault( Constants.MSYS_PATH_KEY, Constants.DEFAULT_MSYS_PATH); + store.setDefault(Constants.BASE_PATH_KEY, Constants.DEFAULT_BASE_PATH); + store.setDefault(Constants.BSP_PATH_KEY, Constants.DEFAULT_BSP_PATH); + if (Platform.getOS().equals(Platform.OS_WIN32)) { + store.setDefault(Constants.CYGWIN_PATH_KEY, Constants.DEFAULT_CYGWIN_PATH); + store.setDefault(Constants.MINGW_PATH_KEY, Constants.DEFAULT_MINGW_PATH); + store.setDefault(Constants.MSYS_PATH_KEY, Constants.DEFAULT_MSYS_PATH); } - store.setDefault( Constants.DISABLE_TOOL_OPTIONS_KEY, Constants.DEFAULT_DISABLE_TOOL_OPTIONS); + store.setDefault(Constants.DISABLE_TOOL_OPTIONS_KEY, Constants.DEFAULT_DISABLE_TOOL_OPTIONS); } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java index a82f7e4..1169041 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java +++ b/org.rtems.cdt/src/org/rtems/cdt/preferences/PreferencePage.java @@ -35,9 +35,9 @@ public class PreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { public PreferencePage() { - super( GRID); - setPreferenceStore( Activator.getDefault().getPreferenceStore()); - setDescription( "Select the RTEMS base installation path and the board support package (BSP) installation path. This provides the default values for all projects. Existing projects are not affected by changes made here."); + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("Select the RTEMS base installation path and the board support package (BSP) installation path. This provides the default values for all projects. Existing projects are not affected by changes made here."); } public void createFieldEditors() { @@ -55,7 +55,7 @@ public class PreferencePage getFieldEditorParent() ) ); - if (Platform.getOS().equals( Platform.OS_WIN32)) { + if (Platform.getOS().equals(Platform.OS_WIN32)) { addField( new DirectoryFieldEditor( Constants.CYGWIN_PATH_KEY, @@ -87,7 +87,7 @@ public class PreferencePage ); } - public void init( IWorkbench workbench) { + public void init(IWorkbench workbench) { // Do nothing } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/properties/PropertyPage.java b/org.rtems.cdt/src/org/rtems/cdt/properties/PropertyPage.java index 5d6d43d..72aa398 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/properties/PropertyPage.java +++ b/org.rtems.cdt/src/org/rtems/cdt/properties/PropertyPage.java @@ -44,34 +44,34 @@ public class PropertyPage extends FieldEditorPreferencePage implements IWorkbenc private IProject mProject; public PropertyPage() { - super( GRID); + super(GRID); // Store properties in a volatile preference store mStore = new VolatilePreferenceStore(); - setPreferenceStore( mStore); + setPreferenceStore(mStore); - setDescription( "You can change the RTEMS base installation path and the board support package (BSP) installation path. This affects only the current project."); + setDescription("You can change the RTEMS base installation path and the board support package (BSP) installation path. This affects only the current project."); } - private void setupStoreValue( IPreferenceStore defaultStore, String key) { - mStore.setDefault( key, defaultStore.getString( key)); - mStore.setValue( key, Storage.getProperty( mProject, key)); + private void setupStoreValue(IPreferenceStore defaultStore, String key) { + mStore.setDefault(key, defaultStore.getString(key)); + mStore.setValue(key, Storage.getProperty(mProject, key)); } protected void createFieldEditors() { // Get current project - mProject = ((IResource) getElement().getAdapter( IResource.class)).getProject(); + mProject = ((IResource) getElement().getAdapter(IResource.class)).getProject(); if (mProject == null) { - mProject = ((ICElement) getElement().getAdapter( ICElement.class)).getCProject().getProject(); + mProject = ((ICElement) getElement().getAdapter(ICElement.class)).getCProject().getProject(); } // Get the default values from the current workbench preferences IPreferenceStore store = Activator.getDefault().getPreferenceStore(); // Setup store values - setupStoreValue( store, Constants.BASE_PATH_KEY); - setupStoreValue( store, Constants.BSP_PATH_KEY); - setupStoreValue( store, Constants.DISABLE_TOOL_OPTIONS_KEY); + setupStoreValue(store, Constants.BASE_PATH_KEY); + setupStoreValue(store, Constants.BSP_PATH_KEY); + setupStoreValue(store, Constants.DISABLE_TOOL_OPTIONS_KEY); // Add field editors addField( @@ -97,20 +97,20 @@ public class PropertyPage extends FieldEditorPreferencePage implements IWorkbenc ); } - private void setProperty( String key) { - Storage.setProperty( mProject, key, mStore.getString( key)); + private void setProperty(String key) { + Storage.setProperty(mProject, key, mStore.getString(key)); } public boolean performOk() { super.performOk(); // Set the new properties - setProperty( Constants.BASE_PATH_KEY); - setProperty( Constants.BSP_PATH_KEY); - setProperty( Constants.DISABLE_TOOL_OPTIONS_KEY); + setProperty(Constants.BASE_PATH_KEY); + setProperty(Constants.BSP_PATH_KEY); + setProperty(Constants.DISABLE_TOOL_OPTIONS_KEY); // Clear platform - Storage.clearPlatform( mProject); + Storage.clearPlatform(mProject); return true; } @@ -119,7 +119,7 @@ public class PropertyPage extends FieldEditorPreferencePage implements IWorkbenc return mElement; } - public void setElement( IAdaptable element) { + public void setElement(IAdaptable element) { this.mElement = element; } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/wizards/BasicSetup.java b/org.rtems.cdt/src/org/rtems/cdt/wizards/BasicSetup.java index d2bd4cc..769523a 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/wizards/BasicSetup.java +++ b/org.rtems.cdt/src/org/rtems/cdt/wizards/BasicSetup.java @@ -60,56 +60,56 @@ public class BasicSetup extends MBSCustomPage { } public boolean canFlipToNextPage() { - return MBSCustomPageManager.getNextPage( pageID) != null; + return MBSCustomPageManager.getNextPage(pageID) != null; } public String getName() { return "Basic Setup Page"; } - public void createControl( Composite parent) { + public void createControl(Composite parent) { // Create base widget - mComposite = new Composite( parent, SWT.NONE); + mComposite = new Composite(parent, SWT.NONE); - GridData gd = new GridData( GridData.FILL_BOTH); - mComposite.setLayoutData( gd); + GridData gd = new GridData(GridData.FILL_BOTH); + mComposite.setLayoutData(gd); GridLayout layout = new GridLayout(); layout.numColumns = 3; - mComposite.setLayout( layout); + mComposite.setLayout(layout); // Base path - Label label = new Label( mComposite, SWT.LEFT); - label.setText( "Base path:"); + Label label = new Label(mComposite, SWT.LEFT); + label.setText("Base path:"); - mBasePath = new Text( mComposite, SWT.LEFT | SWT.BORDER); - gd = new GridData( GridData.FILL_HORIZONTAL); - mBasePath.setLayoutData( gd); + mBasePath = new Text(mComposite, SWT.LEFT | SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + mBasePath.setLayoutData(gd); - Button button = new Button( mComposite, SWT.PUSH); - button.setText( BROWSE); + Button button = new Button(mComposite, SWT.PUSH); + button.setText(BROWSE); button.addSelectionListener( new SelectionAdapter() { - public void widgetSelected( SelectionEvent e) { - browseForPath( mBasePath); + public void widgetSelected(SelectionEvent e) { + browseForPath(mBasePath); } } ); // BSP path - label = new Label( mComposite, SWT.LEFT); - label.setText( "BSP path:"); + label = new Label(mComposite, SWT.LEFT); + label.setText("BSP path:"); - mBSPPath = new Text( mComposite, SWT.LEFT | SWT.BORDER); - gd = new GridData( GridData.FILL_HORIZONTAL); - mBSPPath.setLayoutData( gd); + mBSPPath = new Text(mComposite, SWT.LEFT | SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + mBSPPath.setLayoutData(gd); - button = new Button( mComposite, SWT.PUSH); - button.setText( BROWSE); + button = new Button(mComposite, SWT.PUSH); + button.setText(BROWSE); button.addSelectionListener( new SelectionAdapter() { - public void widgetSelected( SelectionEvent e) { - browseForPath( mBSPPath); + public void widgetSelected(SelectionEvent e) { + browseForPath(mBSPPath); } } ); @@ -117,14 +117,14 @@ public class BasicSetup extends MBSCustomPage { // Connect user input mBasePath.addModifyListener( new ModifyListener() { - public void modifyText( ModifyEvent e) { + public void modifyText(ModifyEvent e) { basePathChanged(); } } ); mBSPPath.addModifyListener( new ModifyListener() { - public void modifyText( ModifyEvent e) { + public void modifyText(ModifyEvent e) { bspPathChanged(); } } @@ -167,19 +167,19 @@ public class BasicSetup extends MBSCustomPage { // Do nothing } - public void setDescription( String description) { + public void setDescription(String description) { // Do nothing } - public void setImageDescriptor( ImageDescriptor image) { + public void setImageDescriptor(ImageDescriptor image) { // Do nothing } - public void setTitle( String title) { + public void setTitle(String title) { // Do nothing } - public void setVisible( boolean visible) { + public void setVisible(boolean visible) { // Get current project CDTCommonProjectWizard wizard = (CDTCommonProjectWizard) getWizard(); IProject project = wizard.getLastProject(); @@ -191,42 +191,42 @@ public class BasicSetup extends MBSCustomPage { if (visible) { if (project != null) { // For already created projects use the properties - mBasePath.setText( Storage.getProperty( project, Constants.BASE_PATH_KEY)); - mBSPPath.setText( Storage.getProperty( project, Constants.BSP_PATH_KEY)); + mBasePath.setText(Storage.getProperty(project, Constants.BASE_PATH_KEY)); + mBSPPath.setText(Storage.getProperty(project, Constants.BSP_PATH_KEY)); } else { // For not yet created projects use the preferences - mBasePath.setText( Storage.getPreference( Constants.BASE_PATH_KEY)); - mBSPPath.setText( Storage.getPreference( Constants.BSP_PATH_KEY)); + mBasePath.setText(Storage.getPreference(Constants.BASE_PATH_KEY)); + mBSPPath.setText(Storage.getPreference(Constants.BSP_PATH_KEY)); } } else { if (project != null) { // Store the wizard values in the properties if the project exists already - Storage.setProperty( project, Constants.BASE_PATH_KEY, mBasePath.getText()); - Storage.setProperty( project, Constants.BSP_PATH_KEY, mBSPPath.getText()); + Storage.setProperty(project, Constants.BASE_PATH_KEY, mBasePath.getText()); + Storage.setProperty(project, Constants.BSP_PATH_KEY, mBSPPath.getText()); } } - mComposite.setVisible( visible); + mComposite.setVisible(visible); } protected boolean isCustomPageComplete() { return true; } - private void browseForPath( Text text) { - DirectoryDialog dialog = new DirectoryDialog( mComposite.getShell(), SWT.NONE); - dialog.setFilterPath( text.getText()); + private void browseForPath(Text text) { + DirectoryDialog dialog = new DirectoryDialog(mComposite.getShell(), SWT.NONE); + dialog.setFilterPath(text.getText()); String path = dialog.open(); if (path != null) { - text.setText( path); + text.setText(path); } } private void basePathChanged() { - MBSCustomPageManager.addPageProperty( pageID, Constants.BASE_PATH_KEY, mBasePath.getText()); + MBSCustomPageManager.addPageProperty(pageID, Constants.BASE_PATH_KEY, mBasePath.getText()); } private void bspPathChanged() { - MBSCustomPageManager.addPageProperty( pageID, Constants.BSP_PATH_KEY, mBSPPath.getText()); + MBSCustomPageManager.addPageProperty(pageID, Constants.BSP_PATH_KEY, mBSPPath.getText()); } } diff --git a/org.rtems.cdt/src/org/rtems/cdt/wizards/FinishSetup.java b/org.rtems.cdt/src/org/rtems/cdt/wizards/FinishSetup.java index 0724413..b552194 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/wizards/FinishSetup.java +++ b/org.rtems.cdt/src/org/rtems/cdt/wizards/FinishSetup.java @@ -48,11 +48,11 @@ public class FinishSetup implements Runnable { ); // Set project properties - Storage.setProperty( project, Constants.BASE_PATH_KEY, basePath); - Storage.setProperty( project, Constants.BSP_PATH_KEY, bspPath); + Storage.setProperty(project, Constants.BASE_PATH_KEY, basePath); + Storage.setProperty(project, Constants.BSP_PATH_KEY, bspPath); // Clear platform - Storage.clearPlatform( project); + Storage.clearPlatform(project); } } } -- cgit v1.2.3