From b05007b90fa708f6e65fe865389f62dac0c6892f Mon Sep 17 00:00:00 2001
From: Mikhail-Petrov <dragon294@mail.ru>
Date: Mon, 28 Mar 2016 16:38:34 +0300
Subject: [PATCH] small fixes

---
 hello.txt                      |  0
 src/wrapper/SmartSpaceKPI.java | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 hello.txt

diff --git a/hello.txt b/hello.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/wrapper/SmartSpaceKPI.java b/src/wrapper/SmartSpaceKPI.java
index 5604ecc..668e254 100644
--- a/src/wrapper/SmartSpaceKPI.java
+++ b/src/wrapper/SmartSpaceKPI.java
@@ -137,16 +137,16 @@ public class SmartSpaceKPI {
         for (int i = 0; i < subscriptionIdList.size(); i++) {
             SmartSpaceTriplet curTriplet = tripletList.get(i);
 
-            if (check2Strings(subject, curTriplet.getSubject(), fullMatch))
-                if (check2Strings(predicate, curTriplet.getPredicate(), fullMatch))
-                    if (check2Strings(object, curTriplet.getObject(), fullMatch)) {
-                        SIBResponse unsubscribeResponse = core.unsubscribe(subscriptionIdList.get(i));
-
-                        // у нас проблемы с отпиской от интеллектуального пространства
-                        if (!unsubscribeResponse.isConfirmed()) {
-                            exceptionMessage += subscriptionIdList.get(i) + ": " + unsubscribeResponse.Message + '\n';
-                        }
-                    }
+            if (checkTwoStrings(subject, curTriplet.getSubject(), fullMatch) &&
+                    checkTwoStrings(predicate, curTriplet.getPredicate(), fullMatch) &&
+                    checkTwoStrings(object, curTriplet.getObject(), fullMatch)) {
+                SIBResponse unsubscribeResponse = core.unsubscribe(subscriptionIdList.get(i));
+
+                // у нас проблемы с отпиской от интеллектуального пространства
+                if (!unsubscribeResponse.isConfirmed()) {
+                    exceptionMessage += subscriptionIdList.get(i) + ": " + unsubscribeResponse.Message + '\n';
+                }
+            }
         }
 
         // проблемы во время отписки были, сигнализируем это
@@ -155,7 +155,7 @@ public class SmartSpaceKPI {
         }
     }
 
-    private boolean check2Strings(String mainString, String curString, boolean fullMatch) {
+    private boolean checkTwoStrings(String mainString, String curString, boolean fullMatch) {
         if (mainString == null)
             if (fullMatch)
                 return (curString == null);
-- 
GitLab