Reslove conflicts

pasanjg · Oct 2, 2019 · 4050e23 · 4050e23
2 parents 13de15b + 48c29b5
commit 4050e23
Show file tree

Hide file tree

Showing 5 changed files with 838 additions and 1,159 deletions.
diff --git a/src/main/java/com/sliit/spm/complexity/Inheritance.java b/src/main/java/com/sliit/spm/complexity/Inheritance.java
@@ -67,15 +67,15 @@ public int measure(String currentLine, String fileName ){
 
             if (line != null) {
                 if (classLine) {
-                    ci = 2;
+                    ci = 1;
                 }
 
                 if (containsIgnoreCase(line, " extends ")) {
-                    ci = 3;
+                    ci = 2;
                 }
 
                 if (containsIgnoreCase(line, " implements ")) {
-                    int ciCount = 3;
+                    int ciCount = 2;
 
                     for (int i = 0; i < line.length(); i++) {
                         if (line.charAt(i) == ',') {
@@ -128,7 +128,7 @@ public int measure(String currentLine, String fileName ){
             if (line != null && line.matches(".*[a-zA-Z].*") && comment.matches(".*[a-zA-Z].*")) {
 
                 if (containsIgnoreCase(line, "class ")) {
-                    int ciCount = 2;
+                    int ciCount = 1;
 
                     if(line.contains(":")) {
                         for (int i = 0; i < line.length(); i++) {