String analysis improvements from the review

Author: Dominik Helm

DEVELOPING_OPAL/validate/src/test/java/org/opalj/fpcf/fixtures/string/Complex.java

@@ -31,7 +31,7 @@ public void analyzeString(String s) {}
     @Failure(n = 0, levels = Level.L0)
     @Invalid(n = 0, levels = Level.L1, soundness = SoundnessMode.LOW)
     @PartiallyConstant(n = 0, levels = Level.L1, soundness = SoundnessMode.HIGH, value = "(get-.*|get-Hello, World-.*)")
-    public void complexDependencyResolve(String s, Class clazz) {
+    public void complexDependencyResolve(String s, Class<?> clazz) {
         String properName = s.length() == 1 ? s.substring(0, 1) :
                 getHelloWorld() + "-" + getRuntimeClassName();
         String getterName = "get-" + properName;
@@ -40,7 +40,7 @@ public void complexDependencyResolve(String s, Class clazz) {
             m = clazz.getMethod(getterName);
             System.out.println(m);
             analyzeString(getterName);
-        } catch (NoSuchMethodException var13) {
+        } catch (NoSuchMethodException ignored) {
         }
     }
 

DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/StringAnalysisTest.scala

@@ -189,7 +189,7 @@ sealed abstract class StringAnalysisTest extends PropertiesTest {
 
                     Tuple3(
                         vc,
-                        { s: String => s"${am._2(s)} (#$index)" },
+                        { (s: String) => s"${am._2(s)} (#$index)" },
                         annotationsByIndex(index).toList
                     )
             }

DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/string/StringMatcher.scala

@@ -22,11 +22,11 @@ sealed trait StringMatcher extends AbstractPropertyMatcher {
 
     protected def getActualValues: Property => Option[(String, String)] = {
         case prop: StringConstancyProperty =>
-            val tree = prop.tree.simplify.sorted
+            val tree = prop.tree.simplified.sorted
             if (tree.isInvalid) {
                 None
             } else {
-                Some((tree.constancyLevel.toString.toLowerCase, tree.toRegex))
+                Some((tree.constancyLevel.toString.toLowerCase, tree.regex))
             }
         case p => throw new IllegalArgumentException(s"Tried to extract values from non string property: $p")
     }

OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/SystemProperties.scala

@@ -33,7 +33,7 @@ sealed trait SystemPropertiesPropertyMetaInformation extends PropertyMetaInforma
 case class SystemProperties(values: Set[StringTreeNode])
     extends Property with SystemPropertiesPropertyMetaInformation {
 
-    def mergeWith(other: SystemProperties): SystemProperties = {
+    def meet(other: SystemProperties): SystemProperties = {
         if (values == other.values) this
         else SystemProperties(values ++ other.values)
     }

OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/string/StringConstancyProperty.scala

@@ -32,7 +32,7 @@ class StringConstancyProperty(
         val level = tree.constancyLevel
         val strings = if (level == StringConstancyLevel.Invalid) {
             "No possible strings - Invalid Flow"
-        } else tree.sorted.toRegex
+        } else tree.sorted.regex
 
         s"Level: ${level.toString.toLowerCase}, Possible Strings: $strings"
     }