FORGE-1087: Moved removeProperty from DependencyFacet to MetadataFacet

forge · Aug 5, 2013 · c364dca · c364dca
1 parent 7d0eee1
commit c364dca
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/...jects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java b/...jects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java
@@ -9,7 +9,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Properties;
 
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
@@ -341,18 +340,6 @@ public Dependency resolveProperties(final Dependency dependency)
       return builder;
    }
 
-   @Override
-   public String removeProperty(final String name)
-   {
-      MavenFacet maven = getFaceted().getFacet(MavenFacet.class);
-      Model pom = maven.getPOM();
-
-      Properties properties = pom.getProperties();
-      String result = (String) properties.remove(name);
-      maven.setPOM(pom);
-      return result;
-   }
-
    @Override
    public List<Coordinate> resolveAvailableVersions(final String gavs)
    {

diff --git a/...rojects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java b/...rojects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java
@@ -168,4 +168,17 @@ public String getEffectiveProperty(final String name)
    {
       return getEffectiveProperties().get(name);
    }
+
+   @Override
+   public String removeProperty(final String name)
+   {
+      MavenFacet maven = getFaceted().getFacet(MavenFacet.class);
+      Model pom = maven.getPOM();
+
+      Properties properties = pom.getProperties();
+      String result = (String) properties.remove(name);
+      maven.setPOM(pom);
+      return result;
+   }
+
 }
diff --git a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java
@@ -212,12 +212,6 @@ public interface DependencyFacet extends ProjectFacet
     */
    public void removeManagedDependency(Dependency managedDependency);
 
-   /**
-    * Remove a build property by name. (Build properties, such as ${my.version}, can be used anywhere in a dependency,
-    * and will be expanded during building to their property value.)
-    */
-   public String removeProperty(String name);
-
    /**
     * Remove the given {@link DependencyRepository} from the current project. Return true if the repository was removed;
     * return false otherwise. Return the removed repository, or null if no repository was removed.

diff --git a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java
@@ -97,5 +97,11 @@ public interface MetadataFacet extends ProjectFacet
     * during building to the resolved property value.
     */
    public void setProperty(String name, String value);
+
+   /**
+    * Remove a build property by name. (Build properties, such as ${my.version}, can be used anywhere in a dependency,
+    * and will be expanded during building to their property value.)
+    */
+   public String removeProperty(String name);
 
 }