Changed package structure

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/ClassMetric.java

@@ -1,9 +1,10 @@
 /**
  *
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
+import net.sourceforge.pmd.lang.java.oom.visitor.PackageStats;
 
 /**
  * Metric that can be computed on a class node.

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/Metric.java

@@ -1,7 +1,7 @@
 /**
  *
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom;
 
 /**
  * Umbrella marker interface.

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/Metrics.java

@@ -1,10 +1,13 @@
 /**
  *
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
+import net.sourceforge.pmd.lang.java.oom.metrics.AtfdMetric;
+import net.sourceforge.pmd.lang.java.oom.metrics.WmcMetric;
+import net.sourceforge.pmd.lang.java.oom.visitor.PackageStats;
 
 /**
  * Façade of the Metrics Framework.

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/OperationMetric.java

@@ -1,9 +1,10 @@
 /**
  *
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom;
 
 import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
+import net.sourceforge.pmd.lang.java.oom.visitor.PackageStats;
 
 /**
  * Metric that can be computed on an operation.

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/metrics/AbstractMetric.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.metrics;
 
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/metrics/AtfdMetric.java

@@ -2,12 +2,16 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.metrics;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
-import net.sourceforge.pmd.lang.java.metrics.OperationSignature.Role;
-import net.sourceforge.pmd.lang.java.metrics.Signature.Visibility;
+import net.sourceforge.pmd.lang.java.oom.ClassMetric;
+import net.sourceforge.pmd.lang.java.oom.OperationMetric;
+import net.sourceforge.pmd.lang.java.oom.visitor.OperationSigMask;
+import net.sourceforge.pmd.lang.java.oom.visitor.OperationSignature.Role;
+import net.sourceforge.pmd.lang.java.oom.visitor.PackageStats;
+import net.sourceforge.pmd.lang.java.oom.visitor.Signature.Visibility;
 
 import java.util.List;
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/metrics/WmcMetric.java

@@ -2,9 +2,11 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.metrics;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
+import net.sourceforge.pmd.lang.java.oom.ClassMetric;
+import net.sourceforge.pmd.lang.java.oom.visitor.PackageStats;
 
 /**
  * @author Clément Fournier

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/ClassStats.java

@@ -1,7 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import java.util.HashMap;
 import java.util.List;

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/FieldSigMask.java

@@ -1,7 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 /**
  * Signature mask for a field

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/FieldSignature.java

@@ -1,7 +1,7 @@
 /**
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/OperationSigMask.java

@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
-
-import net.sourceforge.pmd.lang.java.metrics.OperationSignature.Role;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,10 +15,10 @@ import java.util.Set;
  */
 public class OperationSigMask extends SigMask<OperationSignature> {
 
-    private Set<Role> roleMask = new HashSet<>();
+    private Set<OperationSignature.Role> roleMask = new HashSet<>();
     private boolean isAbstractIncluded = false;
 
-    public void setRoleMask(Role... roles) {
+    public void setRoleMask(OperationSignature.Role... roles) {
         roleMask.clear();
         roleMask.addAll(Arrays.asList(roles));
     }
@@ -30,10 +28,10 @@ public class OperationSigMask extends SigMask<OperationSignature> {
     }
 
     public void setAllRoles() {
-        roleMask.addAll(Arrays.asList(Role.ALL));
+        roleMask.addAll(Arrays.asList(OperationSignature.Role.ALL));
     }
 
-    public void remove(Role... roles) {
+    public void remove(OperationSignature.Role... roles) {
         roleMask.removeAll(Arrays.asList(roles));
     }
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/OperationSignature.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/PackageStats.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import java.util.HashMap;
 import java.util.Map;

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/SigMask.java

@@ -2,14 +2,12 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.sourceforge.pmd.lang.java.metrics.Signature.Visibility;
-
 /**
  * Generic signature mask.
  *
@@ -19,14 +17,14 @@ public abstract class SigMask<T extends Signature> {
     /**
      * Visibility mask
      */
-    protected Set<Visibility> visMask = new HashSet<>();
+    protected Set<Signature.Visibility> visMask = new HashSet<>();
 
     /**
      * Clears the visibility mask and adds all parameters.
      *
      * @param visibilities The visibilities to add
      */
-    public void setVisibilityMask(Visibility... visibilities) {
+    public void setVisibilityMask(Signature.Visibility... visibilities) {
         visMask.clear();
         visMask.addAll(Arrays.asList(visibilities));
     }
@@ -35,7 +33,7 @@ public abstract class SigMask<T extends Signature> {
      * Sets the mask to cover all visibilities.
      */
     public void setAllVisibility() {
-        visMask.addAll(Arrays.asList(Visibility.ALL));
+        visMask.addAll(Arrays.asList(Signature.Visibility.ALL));
     }
 
     /**
@@ -43,7 +41,7 @@ public abstract class SigMask<T extends Signature> {
      *
      * @param visibilities The visibilities to remove
      */
-    public void remove(Visibility... visibilities) {
+    public void remove(Signature.Visibility... visibilities) {
         visMask.removeAll(Arrays.asList(visibilities));
     }
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/visitor/Signature.java

@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.metrics;
+package net.sourceforge.pmd.lang.java.oom.visitor;
 
 import net.sourceforge.pmd.lang.java.ast.AbstractJavaAccessNode;
 

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/metrics/AtfdRule.java

@@ -4,8 +4,8 @@
 package net.sourceforge.pmd.lang.java.rule.metrics;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
-import net.sourceforge.pmd.lang.java.metrics.Metrics;
-import net.sourceforge.pmd.lang.java.metrics.Metrics.ClassMetricKey;
+import net.sourceforge.pmd.lang.java.oom.Metrics;
+import net.sourceforge.pmd.lang.java.oom.Metrics.ClassMetricKey;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 /**