Skip to content

Commit 352c37b

Browse files
authored
Merge pull request #358 from drpayyne/issue-332
Added BoxNotEmptyRule to validators
2 parents 43415f3 + e1d8695 commit 352c37b

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.magento.idea.magento2plugin.actions.generation.data.PluginFileData;
1414
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
1515
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
16+
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
1617
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
1718
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierRule;
1819
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
@@ -65,6 +66,8 @@ public class CreateAPluginDialog extends AbstractDialog {
6566

6667
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
6768
message = {NotEmptyRule.MESSAGE, TARGET_MODULE})
69+
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
70+
message = {BoxNotEmptyRule.MESSAGE, TARGET_MODULE})
6871
private FilteredComboBox pluginModule;
6972

7073
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
1414
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
1515
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.AlphanumericWithUnderscoreRule;
16+
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
1617
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
1718
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
1819
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
@@ -63,6 +64,8 @@ public class CreateAnObserverDialog extends AbstractDialog {
6364

6465
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
6566
message = {NotEmptyRule.MESSAGE, OBSERVER_MODULE})
67+
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
68+
message = {BoxNotEmptyRule.MESSAGE, OBSERVER_MODULE})
6669
private FilteredComboBox observerModule;
6770

6871
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.magento.idea.magento2plugin.actions.generation.data.PreferenceFileData;
1515
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
1616
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
17+
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
1718
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
1819
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
1920
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
@@ -65,6 +66,8 @@ public class OverrideClassByAPreferenceDialog extends AbstractDialog { //NOPMD
6566

6667
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
6768
message = {NotEmptyRule.MESSAGE, MODULE})
69+
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
70+
message = {BoxNotEmptyRule.MESSAGE, MODULE})
6871
private FilteredComboBox preferenceModule;
6972

7073
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,

0 commit comments

Comments
 (0)