Skip to content

Commit f47876c

Browse files
committed
929: fix code style
1 parent 34a890e commit f47876c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/com/magento/idea/magento2plugin/actions/generation/NewModuleAction.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,12 @@ public void update(final AnActionEvent event) {
9191
.execute((PsiDirectory) psiElement, project);
9292
if (moduleName == null) {
9393
final String sourceDirPath = ((PsiDirectory) psiElement).getVirtualFile().getPath();
94+
final boolean isCustomCodeSourceDirValid =
95+
MagentoBasePathUtil.isCustomCodeSourceDirValid(sourceDirPath);
96+
final boolean isCustomVendorDirValid =
97+
MagentoBasePathUtil.isCustomVendorDirValid(sourceDirPath);
9498

95-
if (!MagentoBasePathUtil.isCustomCodeSourceDirValid(sourceDirPath)
96-
&& !MagentoBasePathUtil.isCustomVendorDirValid(sourceDirPath)) {
99+
if (!isCustomCodeSourceDirValid && !isCustomVendorDirValid) {
97100
event.getPresentation().setVisible(false);
98101
return;
99102
}

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
2525
import com.magento.idea.magento2plugin.magento.files.ComposerJson;
2626
import com.magento.idea.magento2plugin.magento.packages.Licenses;
27-
import com.magento.idea.magento2plugin.magento.packages.Package;
2827
import com.magento.idea.magento2plugin.project.Settings;
2928
import com.magento.idea.magento2plugin.util.CamelCaseToHyphen;
3029
import com.magento.idea.magento2plugin.util.magento.MagentoBasePathUtil;

src/com/magento/idea/magento2plugin/util/magento/MagentoBasePathUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static boolean isMagentoFolderValid(final String path) {
5151
public static boolean isCustomVendorDirValid(final @NotNull String path) {
5252
final String[] pathParts = path.split(Package.V_FILE_SEPARATOR);
5353

54-
if (pathParts.length < 3) {
54+
if (pathParts.length < 3) { //NOPMD
5555
return false;
5656
}
5757

@@ -76,7 +76,7 @@ public static boolean isCustomVendorDirValid(final @NotNull String path) {
7676
public static boolean isCustomCodeSourceDirValid(final @NotNull String path) {
7777
final String[] pathParts = path.split(Package.V_FILE_SEPARATOR);
7878

79-
if (pathParts.length < 2) {
79+
if (pathParts.length < 2) { //NOPMD
8080
return false;
8181
}
8282

0 commit comments

Comments
 (0)