Skip to content

Commit

Permalink
whitespace, STS warnings, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
burtbeckwith committed Feb 23, 2011
1 parent d6edd7c commit f46eddb
Show file tree
Hide file tree
Showing 297 changed files with 4,412 additions and 4,560 deletions.
12 changes: 6 additions & 6 deletions grails-bootstrap/build.gradle
Original file line number Original file line Diff line number Diff line change
@@ -1,14 +1,14 @@
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.8.0-beta-4' groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.8.0-beta-4'
} }


compileGroovy.doFirst { compileGroovy.doFirst {
ant.mkdir(dir:sourceSets.main.classesDir) ant.mkdir(dir:sourceSets.main.classesDir)
ant.propertyfile(file:"${sourceSets.main.classesDir}/grails.build.properties") { ant.propertyfile(file:"${sourceSets.main.classesDir}/grails.build.properties") {
entry key:"grails.version", value:version entry key:"grails.version", value:version
} }
} }
jar.appendix = 'bootstrap' jar.appendix = 'bootstrap'
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public abstract class AbstractBuildSettings {
protected Map flatConfig = Collections.emptyMap(); protected Map flatConfig = Collections.emptyMap();


abstract File getBaseDir(); abstract File getBaseDir();

/** /**
* Clears any locally cached values * Clears any locally cached values
*/ */
Expand Down Expand Up @@ -119,17 +119,17 @@ public Collection<File> getPluginDirectories() {


/** /**
* Extracts the inline plugin dirs relative to the base dir of this project. * Extracts the inline plugin dirs relative to the base dir of this project.
* *
* @see getInlinePluginsFromConfiguration(Map, File) * @see getInlinePluginsFromConfiguration(Map, File)
*/ */
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({ "rawtypes" })
protected Collection<File> getInlinePluginsFromConfiguration(@SuppressWarnings("hiding") Map config) { protected Collection<File> getInlinePluginsFromConfiguration(@SuppressWarnings("hiding") Map config) {
return getInlinePluginsFromConfiguration(config, getBaseDir()); return getInlinePluginsFromConfiguration(config, getBaseDir());
} }

/** /**
* Extracts the inline plugin dirs from the given config, relative to the given baseDir. * Extracts the inline plugin dirs from the given config, relative to the given baseDir.
* *
* @todo consider trowing an error here if an plugin does not exists at the location. * @todo consider trowing an error here if an plugin does not exists at the location.
*/ */
@SuppressWarnings({ "rawtypes", "hiding" }) @SuppressWarnings({ "rawtypes", "hiding" })
Expand Down Expand Up @@ -188,7 +188,7 @@ public Collection<File> getImplicitPluginDirectories() {
ConcurrentLinkedQueue<File> dirList = new ConcurrentLinkedQueue<File>(); ConcurrentLinkedQueue<File> dirList = new ConcurrentLinkedQueue<File>();


for (String pluginBase : getPluginBaseDirectories()) { for (String pluginBase : getPluginBaseDirectories()) {
File[] pluginDirs = new File(pluginBase).listFiles(new FileFilter(){ File[] pluginDirs = new File(pluginBase).listFiles(new FileFilter() {
public boolean accept(File pathname) { public boolean accept(File pathname) {
final String fileName = pathname.getName(); final String fileName = pathname.getName();
return pathname.isDirectory() && (!fileName.startsWith(".") && fileName.indexOf('-') >- 1); return pathname.isDirectory() && (!fileName.startsWith(".") && fileName.indexOf('-') >- 1);
Expand Down Expand Up @@ -247,7 +247,7 @@ public boolean isInlinePluginLocation(File pluginLocation) {
public Collection<File> getInlinePluginDirectories() { public Collection<File> getInlinePluginDirectories() {
getPluginDirectories(); // initailize the cache getPluginDirectories(); // initailize the cache
Collection<File> locations = (ConcurrentLinkedQueue<File>) cache.get(KEY_INLINE_PLUGIN_LOCATIONS); Collection<File> locations = (ConcurrentLinkedQueue<File>) cache.get(KEY_INLINE_PLUGIN_LOCATIONS);
if (locations == null){ if (locations == null) {
locations = new ConcurrentLinkedQueue<File>(); locations = new ConcurrentLinkedQueue<File>();
cache.put(KEY_INLINE_PLUGIN_LOCATIONS, locations); cache.put(KEY_INLINE_PLUGIN_LOCATIONS, locations);
} }
Expand Down
Loading

0 comments on commit f46eddb

Please sign in to comment.