From a96c0a5b2208d01f0e0c55866a19587111430058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Wy=C5=82uda?= Date: Tue, 30 Jul 2013 23:52:17 +0200 Subject: [PATCH] Minor fixes. --- .../addon/gradle/projects/GradleFacet.java | 2 + .../gradle/projects/GradleFacetImpl.java | 7 +++ .../gradle/projects/GradleProjectLocator.java | 5 +- .../facets/GradleDependencyFacet.java | 2 +- .../projects/facets/GradlePackagingFacet.java | 12 ++-- .../projects/model/GradleModelImpl.java | 57 ++++++++++++------- .../projects/model/GradleModelLoaderImpl.java | 2 +- 7 files changed, 57 insertions(+), 30 deletions(-) diff --git a/api/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacet.java b/api/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacet.java index 148cf54..5eb65f6 100644 --- a/api/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacet.java +++ b/api/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacet.java @@ -35,6 +35,8 @@ public interface GradleFacet extends ProjectFacet void executeTask(String task, String profile); GradleModel getModel(); + + void setModel(GradleModel model); FileResource getGradleResource(); } diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java index e9da5dd..1b60c02 100644 --- a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java +++ b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java @@ -131,4 +131,11 @@ private void checkIfIsForgeLibraryInstalled(String buildScriptPath) throws IOExc forgeLib.setContents(getClass().getResourceAsStream(GradleUtil.FORGE_LIBRARY_RESOURCE)); } } + + @Override + public void setModel(GradleModel model) + { + // TODO Auto-generated method stub + + } } diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleProjectLocator.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleProjectLocator.java index 144fd38..6b6d181 100644 --- a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleProjectLocator.java +++ b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleProjectLocator.java @@ -9,7 +9,7 @@ import javax.inject.Inject; import org.jboss.forge.addon.facets.FacetFactory; -import org.jboss.forge.addon.gradle.projects.facets.GradleResourceFacet; +import org.jboss.forge.addon.gradle.projects.facets.GradleJavaSourceFacet; import org.jboss.forge.addon.projects.Project; import org.jboss.forge.addon.projects.ProjectLocator; import org.jboss.forge.addon.resource.DirectoryResource; @@ -33,7 +33,8 @@ public Project createProject(DirectoryResource targetDir) // facetFactory.install(project, GradleMetadataFacet.class); // facetFactory.install(project, GradlePackagingFacet.class); // facetFactory.install(project, GradleDependencyFacet.class); - facetFactory.install(project, GradleResourceFacet.class); +// facetFactory.install(project, GradleResourceFacet.class); +// facetFactory.install(project, GradleJavaSourceFacet.class); } catch (RuntimeException e) { diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java index 064b331..480e94b 100644 --- a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java +++ b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java @@ -122,7 +122,7 @@ public List getManagedDependencies() } @Override - public Dependency getManagedDependency(Dependency managedDependency) + public Dependency getDirectManagedDependency(Dependency arg0) { // TODO Auto-generated method stub return null; diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java index 376c4fe..afa89a9 100644 --- a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java +++ b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacet.java @@ -7,6 +7,8 @@ package org.jboss.forge.addon.gradle.projects.facets; import org.jboss.forge.addon.facets.AbstractFacet; +import org.jboss.forge.addon.facets.constraints.RequiresFacet; +import org.jboss.forge.addon.gradle.projects.GradleFacet; import org.jboss.forge.addon.projects.Project; import org.jboss.forge.addon.projects.building.ProjectBuilder; import org.jboss.forge.addon.projects.facets.PackagingFacet; @@ -15,28 +17,26 @@ /** * @author Adam Wyłuda */ +@RequiresFacet(value = {GradleFacet.class}) public class GradlePackagingFacet extends AbstractFacet implements PackagingFacet { @Override public boolean install() { - // TODO Auto-generated method stub - return false; + return true; } @Override public boolean isInstalled() { - // TODO Auto-generated method stub - return false; + return true; } @Override public void setPackagingType(String type) { // TODO Auto-generated method stub - } @Override @@ -78,7 +78,7 @@ public String getFinalName() public void setFinalName(String finalName) { // TODO Auto-generated method stub - + } } diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java index 37a6945..e54709a 100644 --- a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java +++ b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java @@ -8,6 +8,7 @@ import java.util.List; +import org.jboss.forge.addon.gradle.parser.GradleUtil; import org.jboss.forge.addon.gradle.projects.exceptions.UnremovableElementException; import org.jboss.forge.addon.resource.FileResource; @@ -17,7 +18,9 @@ public class GradleModelImpl implements GradleModel { private final FileResource gradleResource; - + + private String script; + private String name; private String group; private String version; @@ -30,13 +33,14 @@ public class GradleModelImpl implements GradleModel private List plugins; private List repositories; private List sourceSets; - - public GradleModelImpl(FileResource gradleResource, String projectName, String version, + + public GradleModelImpl(FileResource gradleResource, String script, String projectName, String version, String packaging, String archivePath, List tasks, List dependencies, List managedDependencies, List profiles, List plugins, List repositories, List sourceSets) { + this.script = script; this.gradleResource = gradleResource; this.name = projectName; this.version = version; @@ -126,8 +130,10 @@ public List getSourceSets() @Override public boolean hasTask(String name) { - for (GradleTask task : tasks) { - if (task.getName().equals(name)) { + for (GradleTask task : tasks) + { + if (task.getName().equals(name)) + { return true; } } @@ -137,8 +143,10 @@ public boolean hasTask(String name) @Override public boolean hasDependency(GradleDependencyBuilder builder) { - for (GradleDependency dep : dependencies) { - if (builder.equalsToDep(dep)) { + for (GradleDependency dep : dependencies) + { + if (builder.equalsToDep(dep)) + { return true; } } @@ -148,8 +156,10 @@ public boolean hasDependency(GradleDependencyBuilder builder) @Override public boolean hasManagedDependency(GradleDependencyBuilder builder) { - for (GradleDependency dep : managedDependencies) { - if (builder.equalsToDep(dep)) { + for (GradleDependency dep : managedDependencies) + { + if (builder.equalsToDep(dep)) + { return true; } } @@ -159,8 +169,10 @@ public boolean hasManagedDependency(GradleDependencyBuilder builder) @Override public boolean hasProfile(String name) { - for (GradleProfile profile : profiles) { - if (profile.getName().equals(name)) { + for (GradleProfile profile : profiles) + { + if (profile.getName().equals(name)) + { return true; } } @@ -170,8 +182,10 @@ public boolean hasProfile(String name) @Override public boolean hasPlugin(String clazz) { - for (GradlePlugin plugin : plugins) { - if (plugin.getClazz().equals(clazz)) { + for (GradlePlugin plugin : plugins) + { + if (plugin.getClazz().equals(clazz)) + { return true; } } @@ -181,18 +195,20 @@ public boolean hasPlugin(String clazz) @Override public boolean hasRepository(String url) { - for (GradleRepository repo : repositories) { - if (repo.getURL().equals(url)) { + for (GradleRepository repo : repositories) + { + if (repo.getURL().equals(url)) + { return true; } } return false; } - + @Override public void setGroup(String group) throws UnremovableElementException { - + } @Override @@ -211,14 +227,14 @@ public void setVersion(String version) throws UnremovableElementException public void setPackaging(String packaging) { // TODO Auto-generated method stub - + } @Override public void setArchiveName(String archiveName) { // TODO Auto-generated method stub - + } @Override @@ -230,7 +246,8 @@ public void createTask(GradleTaskBuilder builder) @Override public void createDependency(GradleDependencyBuilder builder) { - // TODO Auto-generated method stub + script = GradleUtil.insertDependency(script, builder.getGroup(), builder.getName(), builder.getVersion(), + builder.getConfiguration()); } @Override diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java index 047b603..516d50c 100644 --- a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java +++ b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderImpl.java @@ -60,7 +60,7 @@ private GradleModel modelFromNode(FileResource fileResource, Node projectNode List repositories = reposFromNode(projectNode); List sourceSets = sourceSetsFromNode(projectNode); - return new GradleModelImpl(fileResource, projectName, version, "", "", tasks, deps, + return new GradleModelImpl(fileResource, "", projectName, version, "", "", tasks, deps, managedDeps, profiles, plugins, repositories, sourceSets); }