From 8aff7cfa8fe90104b39b2efe80ee458f04d27abe Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Fri, 25 Jul 2014 09:15:15 +0300 Subject: [PATCH] Fixes the compilation on JDK 8. --- .../impl/credentialsstorage/CredentialsStorageServiceImpl.java | 1 + .../impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java | 2 +- .../impl/protocol/sip/ServerStoredContactListSipImpl.java | 1 + .../sip/communicator/impl/protocol/ssh/ContactSSHImpl.java | 3 ++- src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java | 2 +- .../java/sip/communicator/service/protocol/AccountManager.java | 1 + .../slick/protocol/sip/TestOperationSetServerStoredInfo.java | 2 +- .../java/sip/communicator/slick/slickless/util/TestBase64.java | 2 +- 8 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java index d56744975..87bbfc21d 100644 --- a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java +++ b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java @@ -10,6 +10,7 @@ import net.java.sip.communicator.service.credentialsstorage.*; import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation import org.jitsi.service.configuration.*; import org.osgi.framework.*; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java b/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java index 56ea0298f..e390389b3 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/sasl/SASLDigestMD5Mechanism.java @@ -13,7 +13,7 @@ import javax.security.sasl.*; import org.jivesoftware.smack.*; -import org.jivesoftware.smack.util.*; +import org.jivesoftware.smack.util.Base64; // disambiguation /** * Creates our custom SASLDigestMD5Mechanism with some changes in order diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java index 659f5dbe4..112a95b48 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/ServerStoredContactListSipImpl.java @@ -23,6 +23,7 @@ import net.java.sip.communicator.service.protocol.ServerStoredDetails.ImageDetail; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation import org.jitsi.util.xml.XMLUtils; import org.w3c.dom.*; diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java index e0fae1d6f..714e27b97 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java @@ -14,10 +14,11 @@ import java.util.*; import net.java.sip.communicator.service.protocol.*; -import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation import net.java.sip.communicator.util.Logger; import com.jcraft.jsch.*; +// disambiguation /** * A Contact of SSH Type diff --git a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java index a4c47e4cf..e4b91e8a4 100644 --- a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java +++ b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java @@ -8,7 +8,7 @@ import java.util.*; -import org.bouncycastle.util.encoders.*; +import org.bouncycastle.util.encoders.Base64; // disambiguation import org.jitsi.service.configuration.*; /** diff --git a/src/net/java/sip/communicator/service/protocol/AccountManager.java b/src/net/java/sip/communicator/service/protocol/AccountManager.java index 07baed303..6cf7c5b7f 100644 --- a/src/net/java/sip/communicator/service/protocol/AccountManager.java +++ b/src/net/java/sip/communicator/service/protocol/AccountManager.java @@ -11,6 +11,7 @@ import net.java.sip.communicator.service.credentialsstorage.*; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation import org.jitsi.service.configuration.*; import org.osgi.framework.*; diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java index f419881c7..2136f3707 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetServerStoredInfo.java @@ -16,7 +16,7 @@ import net.java.sip.communicator.impl.protocol.sip.xcap.*; import net.java.sip.communicator.impl.protocol.sip.xcap.model.prescontent.*; import net.java.sip.communicator.service.protocol.*; -import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation /** * Testing of the user and account info. Tests for reading, adding, removing, diff --git a/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java b/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java index 20d1fa686..713365145 100644 --- a/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java +++ b/test/net/java/sip/communicator/slick/slickless/util/TestBase64.java @@ -9,7 +9,7 @@ import java.util.*; import junit.framework.*; -import net.java.sip.communicator.util.*; +import net.java.sip.communicator.util.Base64; // disambiguation /** * Tests the methods of the Base64 class.