Bug 512289 - Add sign in and sign out in help menu
Fix reference to since-renamed showPullDown command
Fix NPE in AccountDetails contribution item
Change-Id: Idb8c39c5306bc315ea60abea36e0457f5ceb5a87
diff --git a/org.eclipse.userstorage.oauth/plugin.xml b/org.eclipse.userstorage.oauth/plugin.xml
index b85897a..251f00b 100644
--- a/org.eclipse.userstorage.oauth/plugin.xml
+++ b/org.eclipse.userstorage.oauth/plugin.xml
@@ -18,6 +18,7 @@
allPopups="false"
locationURI="menu:help?after=additions">
<menu
+ icon="icons/UserAccount.png"
id="org.eclipse.userstorage.accounts"
label="Eclipse User Storage">
<command
@@ -54,7 +55,7 @@
id="org.eclipse.userstorage.accounts"
label="Eclipse User Storage">
<command
- commandId="org.eclipse.userstorage.ui.showDropDown"
+ commandId="org.eclipse.userstorage.ui.showPullDown"
id="org.eclipse.userstorage.accounts"
icon="icons/UserAccount.png"
tooltip="Eclipse User Storage"
diff --git a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/ui/AccountDetails.java b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/ui/AccountDetails.java
index 0f5c59b..d6f822f 100644
--- a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/ui/AccountDetails.java
+++ b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/ui/AccountDetails.java
@@ -79,7 +79,7 @@
if (eclipseAccounts.isEmpty())
{
item.setEnabled(false);
- new MenuItem(menu, SWT.SEPARATOR, ++index);
+ new MenuItem(menu, SWT.SEPARATOR, index++);
return;
}
item.addSelectionListener(new SelectionListener()
