diff -r 2a9601315dfc -r 98ccebc37403 javauis/lcdui_akn/lcdui/src/CMIDEdwin.cpp --- a/javauis/lcdui_akn/lcdui/src/CMIDEdwin.cpp Mon May 03 12:27:20 2010 +0300 +++ b/javauis/lcdui_akn/lcdui/src/CMIDEdwin.cpp Fri May 14 15:47:24 2010 +0300 @@ -1189,35 +1189,30 @@ to either the displayable or to the item. Commands will be processed in ProcessCommandL(). */ void CMIDEdwin::CreateNonMidletCommandsL() { - RPointerArray array; - CleanupClosePushL(array); - if (((iConstraints & MMIDTextField::EConstraintMask) == MMIDTextField::EPhoneNumber) && !(iConstraints & MMIDTextField::EUneditable)) { - AddCommandToArrayL(array, R_MIDP_PB_FETCH_NUMBER_SHORT_COMMAND_TEXT, R_MIDP_PB_FETCH_NUMBER_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandFetchPhoneNumber); - AddCommandToArrayL(array, R_MIDP_CREATE_CALL_SHORT_COMMAND_TEXT, R_MIDP_CREATE_CALL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandCreatePhoneCall); + AddCommandToEdwinL(R_MIDP_PB_FETCH_NUMBER_SHORT_COMMAND_TEXT, R_MIDP_PB_FETCH_NUMBER_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandFetchPhoneNumber); + AddCommandToEdwinL(R_MIDP_CREATE_CALL_SHORT_COMMAND_TEXT, R_MIDP_CREATE_CALL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandCreatePhoneCall); } if (((iConstraints & MMIDTextField::EConstraintMask) == MMIDTextField::EPhoneNumber) && (iConstraints & MMIDTextField::EUneditable)) { - AddCommandToArrayL(array, R_MIDP_CREATE_CALL_SHORT_COMMAND_TEXT, R_MIDP_CREATE_CALL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandCreatePhoneCall); + AddCommandToEdwinL(R_MIDP_CREATE_CALL_SHORT_COMMAND_TEXT, R_MIDP_CREATE_CALL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandCreatePhoneCall); } if (((iConstraints & MMIDTextField::EConstraintMask) == MMIDTextField::EMailAddr) && !(iConstraints & MMIDTextField::EUneditable)) { - AddCommandToArrayL(array, R_MIDP_PB_FETCH_EMAIL_SHORT_COMMAND_TEXT, R_MIDP_PB_FETCH_EMAIL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandFetchEmailAddress); + AddCommandToEdwinL(R_MIDP_PB_FETCH_EMAIL_SHORT_COMMAND_TEXT, R_MIDP_PB_FETCH_EMAIL_COMMAND_TEXT, CMIDEdwinUtils::EMenuCommandFetchEmailAddress); } - AddCommandsToEdwinL(array); - - CleanupStack::PopAndDestroy(&array); } /** -Creates and adds new command to array based on shot & long label resource ids +Creates and adds new command to edwin based on shot & long label resource ids and other parameters. */ -void CMIDEdwin::AddCommandToArrayL(RPointerArray& aArray, - TInt aCommandResIdShort, TInt aCommandResIdLong, TInt aCommandId) +void CMIDEdwin::AddCommandToEdwinL(TInt aCommandResIdShort, + TInt aCommandResIdLong, + TInt aCommandId) { TBuf<64> shortLabel; iEikonEnv->ReadResourceL(shortLabel, aCommandResIdShort); @@ -1230,17 +1225,16 @@ STATIC_CAST(CMIDCommand*,cmd)->SetObserver(this); - aArray.AppendL(cmd); + AddCommandToEdwinL(*cmd); CleanupStack::Pop(cmd); } /** -Creates and adds new command to array, short label is the same as long label. +Creates and adds new command to edwin, short label is the same as long label. */ -void CMIDEdwin::AddCommandToArrayL(RPointerArray& aArray, - TInt aCommandResId, TInt aCommandId) +void CMIDEdwin::AddCommandToEdwinL(TInt aCommandResId, TInt aCommandId) { - AddCommandToArrayL(aArray, aCommandResId, aCommandResId, aCommandId); + AddCommandToEdwinL(aCommandResId, aCommandResId, aCommandId); } /** This method is called from the destructor and removes