Skip to content

Commit

Permalink
Change name GradleUtil to GradleSourceUtil
Browse files Browse the repository at this point in the history
  • Loading branch information
adam-wyluda committed Aug 5, 2013
1 parent 3111ed8 commit 928344f
Show file tree
Hide file tree
Showing 4 changed files with 341 additions and 341 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import javax.inject.Inject;

import org.jboss.forge.addon.facets.AbstractFacet;
import org.jboss.forge.addon.gradle.parser.GradleUtil;
import org.jboss.forge.addon.gradle.parser.GradleSourceUtil;
import org.jboss.forge.addon.gradle.projects.model.GradleModel;
import org.jboss.forge.addon.gradle.projects.model.GradleModelLoader;
import org.jboss.forge.addon.projects.Project;
Expand Down Expand Up @@ -94,10 +94,10 @@ private GradleModel loadModel(String buildScriptPath) throws IOException
{
String directory = new File(buildScriptPath).getParent();

manager.runGradleBuild(directory, GradleUtil.FORGE_OUTPUT_TASK, "");
manager.runGradleBuild(directory, GradleSourceUtil.FORGE_OUTPUT_TASK, "");

FileResource<?> forgeOutputfile = (FileResource<?>) resourceFactory.create(new File(directory,
GradleUtil.FORGE_OUTPUT_XML));
GradleSourceUtil.FORGE_OUTPUT_XML));
String forgeOutput = Streams.toString(forgeOutputfile.getResourceInputStream());

forgeOutputfile.delete();
Expand All @@ -115,7 +115,7 @@ private void checkIfIsForgeLibraryInstalled(String buildScriptPath) throws IOExc
InputStream scriptInputStream = scriptResource.getResourceInputStream();
String script = Streams.toString(scriptInputStream);
Streams.closeQuietly(scriptInputStream);
String newScript = GradleUtil.checkForIncludeForgeLibraryAndInsert(script);
String newScript = GradleSourceUtil.checkForIncludeForgeLibraryAndInsert(script);

// If Forge library is not included
if (!script.equals(newScript))
Expand All @@ -124,11 +124,11 @@ private void checkIfIsForgeLibraryInstalled(String buildScriptPath) throws IOExc
}

FileResource<?> forgeLib = (FileResource<?>) resourceFactory
.create(new File(directory, GradleUtil.FORGE_LIBRARY));
.create(new File(directory, GradleSourceUtil.FORGE_LIBRARY));
// TODO check existing forge library version and replace with newer if necessary
if (!forgeLib.exists())
{
forgeLib.setContents(getClass().getResourceAsStream(GradleUtil.FORGE_LIBRARY_RESOURCE));
forgeLib.setContents(getClass().getResourceAsStream(GradleSourceUtil.FORGE_LIBRARY_RESOURCE));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* @author Adam Wyłuda
*/
public class GradleUtil
public class GradleSourceUtil
{
public static final String FORGE_LIBRARY = "forge.gradle";
public static final String FORGE_LIBRARY_RESOURCE = "/forge.gradle";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.List;

import org.jboss.forge.addon.gradle.parser.GradleUtil;
import org.jboss.forge.addon.gradle.parser.GradleSourceUtil;
import org.jboss.forge.addon.gradle.projects.exceptions.UnremovableElementException;
import org.jboss.forge.addon.resource.FileResource;

Expand Down Expand Up @@ -246,7 +246,7 @@ public void createTask(GradleTaskBuilder builder)
@Override
public void createDependency(GradleDependencyBuilder builder)
{
script = GradleUtil.insertDependency(script, builder.getGroup(), builder.getName(), builder.getVersion(),
script = GradleSourceUtil.insertDependency(script, builder.getGroup(), builder.getName(), builder.getVersion(),
builder.getConfiguration());
}

Expand Down

0 comments on commit 928344f

Please sign in to comment.