Refactor

Author: luontola

retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/BackportLambdaInvocations.java

@@ -1,4 +1,4 @@
-// Copyright © 2013-2016 Esko Luontola and other Retrolambda contributors
+// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -104,13 +104,7 @@ private boolean isOwnedMethodVisible(Handle implMethod) {
     }
 
     private boolean isNonOwnedMethodVisible(Handle implMethod) {
-        int classNameLastSlash = className.lastIndexOf('/');
-        String classPackage = classNameLastSlash == -1 ? "" : className.substring(0, classNameLastSlash);
-
-        int implMethodLastSlash = implMethod.getOwner().lastIndexOf('/');
-        String implPackage = implMethodLastSlash == -1 ? "" : implMethod.getOwner().substring(0, implMethodLastSlash);
-
-        if (classPackage.equals(implPackage)) {
+        if (getPackage(className).equals(getPackage(implMethod.getOwner()))) {
             return true; // All method visibilities in the same package will be visible.
         }
 
@@ -126,6 +120,11 @@ private boolean isNonOwnedMethodVisible(Handle implMethod) {
         return true;
     }
 
+    private static String getPackage(String className) {
+        int lastSlash = className.lastIndexOf('/');
+        return lastSlash == -1 ? "" : className.substring(0, lastSlash);
+    }
+
     private String getLambdaAccessMethodDesc(Handle implMethod) {
         if (implMethod.getTag() == H_INVOKESTATIC) {
             // static method call -> keep as-is