Fixes error message when create call fails.

cusax-fix
Yana Stamcheva 13 years ago
parent 172b5e819d
commit a7f88957c6

@ -146,6 +146,7 @@ service.gui.CONTACTS=Contacts
service.gui.COPY=&Copy service.gui.COPY=&Copy
service.gui.COPY_LINK=Copy &link service.gui.COPY_LINK=Copy &link
service.gui.CREATE=C&reate 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=&Create chat room...
service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create {0} chat room. service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create {0} chat room.
service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard

@ -17,7 +17,6 @@
import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.customcontrols.*;
import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.main.contactlist.*; 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.contactlist.*;
import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.*;
@ -278,7 +277,7 @@ public static void answerCallInFirstExistingCall(Call call)
* Merges specific existing <tt>Call</tt>s into a specific telephony * Merges specific existing <tt>Call</tt>s into a specific telephony
* conference. * conference.
* *
* @param first first call * @param conference the conference
* @param calls list of calls * @param calls list of calls
*/ */
public static void mergeExistingCalls( public static void mergeExistingCalls(
@ -311,7 +310,7 @@ public static void hangupCall(Call call)
/** /**
* Hang ups the given <tt>callPeer</tt>. * Hang ups the given <tt>callPeer</tt>.
* *
* @param callPeer the <tt>CallPeer</tt> to hang up * @param peer the <tt>CallPeer</tt> to hang up
*/ */
public static void hangupCallPeer(CallPeer peer) public static void hangupCallPeer(CallPeer peer)
{ {
@ -960,6 +959,8 @@ public static void createConferenceCall(
* Asynchronously creates a new video bridge conference <tt>Call</tt> with * Asynchronously creates a new video bridge conference <tt>Call</tt> with
* a specific list of participants/callees. * a specific list of participants/callees.
* *
* @param callProvider the <tt>ProtocolProviderService</tt> to use for
* creating the call
* @param callees the list of participants/callees to invite to the * @param callees the list of participants/callees to invite to the
* newly-created video bridge conference <tt>Call</tt> * newly-created video bridge conference <tt>Call</tt>
*/ */
@ -1435,6 +1436,7 @@ public void run()
/** /**
* Indicates if we have video streams to show in this interface. * Indicates if we have video streams to show in this interface.
* *
* @param call the call to check for video streaming
* @return <tt>true</tt> if we have video streams to show in this interface; * @return <tt>true</tt> if we have video streams to show in this interface;
* otherwise, <tt>false</tt> * otherwise, <tt>false</tt>
*/ */
@ -1446,6 +1448,7 @@ public static boolean isVideoStreaming(Call call)
/** /**
* Indicates if we have video streams to show in this interface. * Indicates if we have video streams to show in this interface.
* *
* @param conference the conference we check for video streaming
* @return <tt>true</tt> if we have video streams to show in this interface; * @return <tt>true</tt> if we have video streams to show in this interface;
* otherwise, <tt>false</tt> * otherwise, <tt>false</tt>
*/ */
@ -1576,6 +1579,8 @@ public static boolean addressesAreEqual(String a, String b)
* user. * user.
* *
* @param conferenceMember the conference member to check * @param conferenceMember the conference member to check
* @return <tt>true</tt> if the given <tt>conferenceMember</tt> is the local
* user, <tt>false</tt> - otherwise
*/ */
public static boolean isLocalUser(ConferenceMember conferenceMember) 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 * Searches for additional phone numbers found in contact information
*
* @param metaContact the <tt>MetaContact</tt> for which we're looking for
* additional numbers
* @return additional phone numbers found in contact information; * @return additional phone numbers found in contact information;
*/ */
public static List<UIContactDetail> getAdditionalNumbers( public static List<UIContactDetail> getAdditionalNumbers(
@ -1817,11 +1825,18 @@ else if (stringContact != null
throw (ThreadDeath) t; throw (ThreadDeath) t;
logger.error("The call could not be created: ", 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( new ErrorDialog(
null, null,
GuiActivator.getResources().getI18NString( GuiActivator.getResources().getI18NString(
"service.gui.ERROR"), "service.gui.ERROR"),
t.getMessage(), message,
t) t)
.showDialog(); .showDialog();
} }

Loading…
Cancel
Save