Code style fixed in accordance with the conventions

sysgears · Apr 1, 2014 · 6abdc13 · 6abdc13
1 parent 447f58f
commit 6abdc13
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/groovy/com/sysgears/grain/gradle/GrainInstallTask.groovy b/src/main/groovy/com/sysgears/grain/gradle/GrainInstallTask.groovy
@@ -13,12 +13,6 @@ import org.gradle.api.tasks.TaskInstantiationException
  */
 class GrainInstallTask extends DefaultTask {
 
-    /** Grain theme to install. */
-    String theme = 'template'
-
-    /** Theme version to install. */
-    String version
-
     /** GitHub username of the user or the organization. */
     private static final String GITHUB_USERNAME = 'sysgears'
 
@@ -28,6 +22,12 @@ class GrainInstallTask extends DefaultTask {
     /** Prefix for the version tags. */
     private static final String VERSION_TAG_PREFIX = 'v'
 
+    /** Grain theme to install. */
+    String theme = 'template'
+
+    /** Theme version to install. */
+    String version
+
     /**
      * Default grain action.
      */

diff --git a/src/main/groovy/com/sysgears/grain/gradle/install/ThemeInstaller.groovy b/src/main/groovy/com/sysgears/grain/gradle/install/ThemeInstaller.groovy
@@ -6,7 +6,7 @@ package com.sysgears.grain.gradle.install
 class ThemeInstaller {
 
     /** Temp archive file to hold theme files. */
-    private static final tempThemeFile = 'theme.zip'
+    private static final TEMP_THEME_FILE = 'theme.zip'
 
     /**
      * Installs theme to a specified directory,
@@ -24,11 +24,11 @@ class ThemeInstaller {
             ant.mkdir(dir: refinedDest)
         }
 
-        ant.get(src: downloadUrl, verbose: 'true', dest: "${refinedDest}${tempThemeFile}")
+        ant.get(src: downloadUrl, verbose: 'true', dest: "${refinedDest}${TEMP_THEME_FILE}")
 
         ant.sequential {
-            ant.unzip(src: "${refinedDest}${tempThemeFile}", dest: "$refinedDest", overwrite: 'true')
-            ant.delete(file: "${refinedDest}${tempThemeFile}")
+            ant.unzip(src: "${refinedDest}${TEMP_THEME_FILE}", dest: "$refinedDest", overwrite: 'true')
+            ant.delete(file: "${refinedDest}${TEMP_THEME_FILE}")
             if (archiveFolder) {
                 ant.copy(todir: "$refinedDest") {
                     fileset(dir: "${refinedDest}${archiveFolder}")