diff --git a/action_basics/build.gradle b/action_basics/build.gradle index 63c21b9dd..dfc17ec9e 100644 --- a/action_basics/build.gradle +++ b/action_basics/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.jetbrains.intellij' version '0.4.7' + id 'org.jetbrains.intellij' version '0.4.8' } sourceCompatibility = 1.8 @@ -27,4 +27,4 @@ intellij { } // Force javadoc rebuild before jar is built -jar.dependsOn javadoc \ No newline at end of file +jar.dependsOn javadoc diff --git a/action_basics/src/main/java/org/intellij/sdk/action/DynamicActionGroup.java b/action_basics/src/main/java/org/intellij/sdk/action/DynamicActionGroup.java index 8db9fddbd..d48c948e1 100644 --- a/action_basics/src/main/java/org/intellij/sdk/action/DynamicActionGroup.java +++ b/action_basics/src/main/java/org/intellij/sdk/action/DynamicActionGroup.java @@ -2,7 +2,6 @@ package org.intellij.sdk.action; -import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -24,16 +23,16 @@ public class DynamicActionGroup extends ActionGroup { /** * Returns an array of menu actions for the group. * - * @param anActionEvent Event received when the associated group-id menu is chosen. + * @param e Event received when the associated group-id menu is chosen. * @return AnAction[] An instance of AnAction, in this case containing a single instance of the - * PopDialogAction class. + * PopupDialogAction class. */ @NotNull @Override - public AnAction[] getChildren(AnActionEvent anActionEvent) { - return new AnAction[]{ new PopDialogAction("Action Added at Runtime", - "Dynamic Action Demo", - ActionBasicsIcons.Sdk_default_icon) + public AnAction[] getChildren(AnActionEvent e) { + return new AnAction[]{ new PopupDialogAction("Action Added at Runtime", + "Dynamic Action Demo", + ActionBasicsIcons.Sdk_default_icon) }; } diff --git a/action_basics/src/main/java/org/intellij/sdk/action/PopDialogAction.java b/action_basics/src/main/java/org/intellij/sdk/action/PopupDialogAction.java similarity index 79% rename from action_basics/src/main/java/org/intellij/sdk/action/PopDialogAction.java rename to action_basics/src/main/java/org/intellij/sdk/action/PopupDialogAction.java index 12e45a515..c51e0c434 100644 --- a/action_basics/src/main/java/org/intellij/sdk/action/PopDialogAction.java +++ b/action_basics/src/main/java/org/intellij/sdk/action/PopupDialogAction.java @@ -19,15 +19,15 @@ import javax.swing.*; * Typically this class is instantiated by the IntelliJ Platform framework based on declarations * in the plugin.xml file. But when added at runtime this class is instantiated by an action group. */ -public class PopDialogAction extends AnAction { +public class PopupDialogAction extends AnAction { /** * This default constructor is used by the IntelliJ Platform framework to - * instantiate this class based on plugin.xml declarations. Only needed in PopDialogAction + * instantiate this class based on plugin.xml declarations. Only needed in PopupDialogAction * class because a second constructor is overridden. * @see AnAction#AnAction() */ - public PopDialogAction() { + public PopupDialogAction() { super(); } @@ -35,12 +35,12 @@ public class PopDialogAction extends AnAction { * This constructor is used to support dynamically added menu actions. * It sets the text, description to be displayed for the menu item. * Otherwise, the default AnAction constructor is used by the IntelliJ Platform. - * @param menuText The text to be displayed as a menu item. - * @param menuDescription The description of the menu item. - * @param menuIcon The icon to be used with the menu item. + * @param text The text to be displayed as a menu item. + * @param description The description of the menu item. + * @param icon The icon to be used with the menu item. */ - public PopDialogAction(@Nullable String menuText, @Nullable String menuDescription, @Nullable Icon menuIcon) { - super(menuText, menuDescription, menuIcon); + public PopupDialogAction(@Nullable String text, @Nullable String description, @Nullable Icon icon) { + super(text, description, icon); } /** @@ -66,13 +66,13 @@ public class PopDialogAction extends AnAction { /** * Determines whether this menu item is available for the current context. * Requires a project to be open. - * @param evnt Event received when the associated group-id menu is chosen. + * @param e Event received when the associated group-id menu is chosen. */ @Override - public void update(AnActionEvent evnt) { + public void update(AnActionEvent e) { // Set the availability based on whether a project is open - Project project = evnt.getProject(); - evnt.getPresentation().setEnabledAndVisible(project != null); + Project project = e.getProject(); + e.getPresentation().setEnabledAndVisible(project != null); } } diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml index 1200274d8..ee75db068 100644 --- a/action_basics/src/main/resources/META-INF/plugin.xml +++ b/action_basics/src/main/resources/META-INF/plugin.xml @@ -40,7 +40,7 @@ The optional "use-shortcut-of" attribute specifies the ID of the action whose keyboard shortcut this action will use. The optional "description" attribute specifies the text which is displayed in the status bar when the action is focused. The optional "icon" attribute specifies the icon which is displayed on the toolbar button or next to the menu item. --> - - - + @@ -94,7 +94,7 @@ -