bugfix Sendto sort order

Author: isayan

release/YaguraExtender-v2.2.jar

@@ -66,7 +66,14 @@ private String getMenuItemCaption(boolean forceSortOrder, int ord, String captio
         else
             return caption; 
     }
-        
+
+    private int getMenuItemCount(boolean isSubmenu) {
+        if (isSubmenu) 
+            return this.mnuSendTo.getItemCount();
+        else
+            return this.menuList.size();
+    }
+    
     public void renewMenu(SendToProperty property) {
         this.mnuSendTo.setText("Send To");
         this.sendToList.clear();
@@ -75,15 +82,14 @@ public void renewMenu(SendToProperty property) {
             this.mnuSendTo.removeAll();
             this.menuList.add(this.mnuSendTo);
         }
-        BurpExtender.outPrintln("renewMenu:");
         List<SendToItem> sendToItemList = property.getSendToItemList();
         for (SendToItem item : sendToItemList) {
             if (item.isSelected()) {
                 if (item.getExtend() != null) {
                     SendToExtend sendToItem = new SendToExtend(item, this.invocation);
                     if (sendToItem.getExtend() == SendToItem.ExtendType.PASTE_FROM_CLIPBOARD) {
                         javax.swing.JMenu mnuItem = new javax.swing.JMenu();
-                        mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), this.menuList.size(), item.getCaption()));
+                        mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), getMenuItemCount(property.isSubMenu()), item.getCaption()));
                         List<String> encodingList = BurpExtender.getInstance().getSelectEncodingList();
                         for (String encoding : encodingList) {
                             javax.swing.JMenuItem mnuItemEncoding = new javax.swing.JMenuItem();
@@ -102,7 +108,7 @@ public void renewMenu(SendToProperty property) {
                         }
                     } else {
                         javax.swing.JMenuItem mnuItem = new javax.swing.JMenuItem();
-                        mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), this.menuList.size(), item.getCaption()));
+                        mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), getMenuItemCount(property.isSubMenu()), item.getCaption()));
                         sendToList.add(sendToItem);
                         mnuItem.addActionListener(sendToItem);
                         if (property.isSubMenu()) {
@@ -117,7 +123,7 @@ public void renewMenu(SendToProperty property) {
                     }
                 } else {
                     javax.swing.JMenuItem mnuItem = new javax.swing.JMenuItem();
-                    mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), this.menuList.size(), item.getCaption()));
+                    mnuItem.setText(getMenuItemCaption(property.isForceSortOrder(), getMenuItemCount(property.isSubMenu()), item.getCaption()));
                     if (item.isServer()) {
                         SendToMenuItem sendToItem = new SendToServer(item, this.invocation);
                         sendToItem.addSendToListener(new SendToListener() {