Skip to content

Added BoxNotEmptyRule to validators #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2020
Merged

Added BoxNotEmptyRule to validators #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f3ba8
Added BoxNotEmptyRule to validators
drpayyne Oct 27, 2020
e1d8695
Merge branch '2.1.0-develop' into issue-332
coderimus Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.magento.idea.magento2plugin.actions.generation.data.PluginFileData;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
Expand Down Expand Up @@ -65,6 +66,8 @@ public class CreateAPluginDialog extends AbstractDialog {

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
message = {NotEmptyRule.MESSAGE, TARGET_MODULE})
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
message = {BoxNotEmptyRule.MESSAGE, TARGET_MODULE})
private FilteredComboBox pluginModule;

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
Expand Down
3 changes: 3 additions & 0 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.AlphanumericWithUnderscoreRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
Expand Down Expand Up @@ -63,6 +64,8 @@ public class CreateAnObserverDialog extends AbstractDialog {

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
message = {NotEmptyRule.MESSAGE, OBSERVER_MODULE})
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
message = {BoxNotEmptyRule.MESSAGE, OBSERVER_MODULE})
private FilteredComboBox observerModule;

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
Expand Down
3 changes: 3 additions & 0 deletions ...gento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.magento.idea.magento2plugin.actions.generation.data.PreferenceFileData;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.BoxNotEmptyRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.DirectoryRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
Expand Down Expand Up @@ -65,6 +66,8 @@ public class OverrideClassByAPreferenceDialog extends AbstractDialog { //NOPMD

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
message = {NotEmptyRule.MESSAGE, MODULE})
@FieldValidation(rule = RuleRegistry.BOX_NOT_EMPTY,
message = {BoxNotEmptyRule.MESSAGE, MODULE})
private FilteredComboBox preferenceModule;

@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
Expand Down