diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index de8cde763..fd28ee725 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -146,6 +146,7 @@ service.gui.CONTACTS=Contacts service.gui.COPY=&Copy service.gui.COPY_LINK=Copy &link service.gui.CREATE=C&reate +servoce.gui.CREATE_CALL_FAILED=Failed to create the call. service.gui.CREATE_CHAT_ROOM=&Create chat room... service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create {0} chat room. service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java index 456921e51..a3ddc4ede 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java @@ -17,7 +17,6 @@ import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; -import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; @@ -278,7 +277,7 @@ public static void answerCallInFirstExistingCall(Call call) * Merges specific existing Calls into a specific telephony * conference. * - * @param first first call + * @param conference the conference * @param calls list of calls */ public static void mergeExistingCalls( @@ -311,7 +310,7 @@ public static void hangupCall(Call call) /** * Hang ups the given callPeer. * - * @param callPeer the CallPeer to hang up + * @param peer the CallPeer to hang up */ public static void hangupCallPeer(CallPeer peer) { @@ -960,6 +959,8 @@ public static void createConferenceCall( * Asynchronously creates a new video bridge conference Call with * a specific list of participants/callees. * + * @param callProvider the ProtocolProviderService to use for + * creating the call * @param callees the list of participants/callees to invite to the * newly-created video bridge conference Call */ @@ -1435,6 +1436,7 @@ public void run() /** * Indicates if we have video streams to show in this interface. * + * @param call the call to check for video streaming * @return true if we have video streams to show in this interface; * otherwise, false */ @@ -1446,6 +1448,7 @@ public static boolean isVideoStreaming(Call call) /** * Indicates if we have video streams to show in this interface. * + * @param conference the conference we check for video streaming * @return true if we have video streams to show in this interface; * otherwise, false */ @@ -1576,6 +1579,8 @@ public static boolean addressesAreEqual(String a, String b) * user. * * @param conferenceMember the conference member to check + * @return true if the given conferenceMember is the local + * user, false - otherwise */ public static boolean isLocalUser(ConferenceMember conferenceMember) { @@ -1589,6 +1594,9 @@ public static boolean isLocalUser(ConferenceMember conferenceMember) /** * Searches for additional phone numbers found in contact information + * + * @param metaContact the MetaContact for which we're looking for + * additional numbers * @return additional phone numbers found in contact information; */ public static List getAdditionalNumbers( @@ -1817,11 +1825,18 @@ else if (stringContact != null throw (ThreadDeath) t; logger.error("The call could not be created: ", t); + + String message = GuiActivator.getResources() + .getI18NString("servoce.gui.CREATE_CALL_FAILED"); + + if (t.getMessage() != null) + message += " " + t.getMessage(); + new ErrorDialog( null, GuiActivator.getResources().getI18NString( "service.gui.ERROR"), - t.getMessage(), + message, t) .showDialog(); }