Commit fbee25f

committed

Refactor method signatures and reorder variable declarations.

Improve code readability by adjusting method signatures for better formatting and consistency. Reorder certain variable declarations to align with logical execution flow. Add `@SuppressWarnings` annotation in `Settings.java` to suppress PMD warnings about excessive public count.

1 parent 4228059 commit fbee25fCopy full SHA for fbee25f

File tree

3 files changed

+21

-6

lines changed

src/main/java/com/magento/idea/magento2plugin
- actions/content/root
  - MarkDirectoryAsMagentoContentRot.java
  - UnmarkDirectoryAsMagentoContentRot.java
- project
  - Settings.java

3 files changed

+21

-6

lines changed

`‎src/main/java/com/magento/idea/magento2plugin/actions/content/root/MarkDirectoryAsMagentoContentRot.java‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ public MarkDirectoryAsMagentoContentRot() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- protected void modifyRoots(final VirtualFile virtualFile, ContentEntry contentEntry) {`
	`43`	`+ protected void modifyRoots(`
	`44`	`+ final VirtualFile virtualFile,`
	`45`	`+ final ContentEntry contentEntry`
	`46`	`+ ) {`
`44`	`47`	`if (project != null) {`
`45`	`48`	`final Settings settings = Settings.getInstance(project);`
`46`	`49`	`Settings.getInstance(project).addMagentoFolder(virtualFile.getUrl());`
`@@ -70,13 +73,13 @@ public void update(@NotNull final AnActionEvent event) {`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`if (targetElement instanceof PsiDirectory && project != null) {`
`73`		`- final Settings settings = Settings.getInstance(project);`
`74`	`76`	`final String magentoPathUrl = MagentoPathUrlUtil.execute(project);`
`75`	`77`	`final String directoryUrl = ((PsiDirectory) targetElement).getVirtualFile().getUrl();`
`76`	`78`	`if (magentoPathUrl != null && magentoPathUrl.equals(directoryUrl)) {`
`77`	`79`	`event.getPresentation().setEnabledAndVisible(false);`
`78`	`80`	`return;`
`79`	`81`	`}`
	`82`	`+ final Settings settings = Settings.getInstance(project);`
`80`	`83`	`if (!settings.containsMagentoFolder(directoryUrl)) {`
`81`	`84`	`event.getPresentation().setEnabledAndVisible(true);`
`82`	`85`	`return;`
`@@ -87,7 +90,10 @@ public void update(@NotNull final AnActionEvent event) {`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`@Override`
`90`		`- protected boolean isEnabled(@NotNull RootsSelection rootsSelection, @NotNull Module module) {`
	`93`	`+ protected boolean isEnabled(`
	`94`	`+ @NotNull final RootsSelection rootsSelection,`
	`95`	`+ @NotNull final Module module`
	`96`	`+ ) {`
`91`	`97`	`return false;`
`92`	`98`	`}`
`93`	`99`	`}`

`‎src/main/java/com/magento/idea/magento2plugin/actions/content/root/UnmarkDirectoryAsMagentoContentRot.java‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,10 @@ public class UnmarkDirectoryAsMagentoContentRot extends MarkRootActionBase {`
`28`	`28`	`private Project project;`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- protected void modifyRoots(final VirtualFile virtualFile, ContentEntry contentEntry) {`
	`31`	`+ protected void modifyRoots(`
	`32`	`+ final VirtualFile virtualFile,`
	`33`	`+ final ContentEntry contentEntry`
	`34`	`+ ) {`
`32`	`35`	`if (project != null) {`
`33`	`36`	`final Settings settings = Settings.getInstance(project);`
`34`	`37`	`Settings.getInstance(project).removeMagentoFolder(virtualFile.getUrl());`
`@@ -58,14 +61,14 @@ public void update(@NotNull final AnActionEvent event) {`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`if (targetElement instanceof PsiDirectory && project != null) {`
`61`		`- final Settings settings = Settings.getInstance(project);`
`62`	`64`	`final String magentoPathUrl = MagentoPathUrlUtil.execute(project);`
`63`	`65`	`final String directoryUrl = ((PsiDirectory) targetElement).getVirtualFile().getUrl();`
`64`	`66`	`if (magentoPathUrl != null && magentoPathUrl.equals(directoryUrl)) {`
`65`	`67`	`event.getPresentation().setEnabledAndVisible(false);`
`66`	`68`	`return;`
`67`	`69`	`}`
`68`	`70`
	`71`	`+ final Settings settings = Settings.getInstance(project);`
`69`	`72`	`if (settings.containsMagentoFolder(directoryUrl)) {`
`70`	`73`	`event.getPresentation().setEnabledAndVisible(true);`
`71`	`74`	`return;`
`@@ -76,7 +79,10 @@ public void update(@NotNull final AnActionEvent event) {`
`76`	`79`	`}`
`77`	`80`
`78`	`81`	`@Override`
`79`		`- protected boolean isEnabled(@NotNull RootsSelection rootsSelection, @NotNull Module module) {`
	`82`	`+ protected boolean isEnabled(`
	`83`	`+ @NotNull final RootsSelection rootsSelection,`
	`84`	`+ @NotNull final Module module`
	`85`	`+ ) {`
`80`	`86`	`return false;`
`81`	`87`	`}`
`82`	`88`	`}`

`‎src/main/java/com/magento/idea/magento2plugin/project/Settings.java‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@`
`21`	`21`	`import org.jetbrains.annotations.NotNull;`
`22`	`22`	`import org.jetbrains.annotations.Nullable;`
`23`	`23`
	`24`	`+@SuppressWarnings({`
	`25`	`+ "PMD.ExcessivePublicCount"`
	`26`	`+})`
`24`	`27`	`@State(`
`25`	`28`	`name = "Magento2PluginSettings",`
`26`	`29`	`storages = {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fbee25f

File tree

3 files changed

3 files changed

`‎src/main/java/com/magento/idea/magento2plugin/actions/content/root/MarkDirectoryAsMagentoContentRot.java‎`

`‎src/main/java/com/magento/idea/magento2plugin/actions/content/root/UnmarkDirectoryAsMagentoContentRot.java‎`

`‎src/main/java/com/magento/idea/magento2plugin/project/Settings.java‎`

0 commit comments