Skip to content

Commit 957f65c

Browse files
committed
842: Create new message queue
1 parent 40daf29 commit 957f65c

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

src/com/magento/idea/magento2plugin/actions/generation/generator/MessageQueueClassGenerator.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@
2121
import com.magento.idea.magento2plugin.magento.packages.File;
2222
import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
2323
import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
24+
25+
import java.util.ArrayList;
26+
import java.util.List;
2427
import java.util.Properties;
2528
import javax.swing.JOptionPane;
2629

2730
public class MessageQueueClassGenerator extends FileGenerator {
31+
2832
private final MessageQueueClassData messageQueueClassDataName;
2933
private final Project project;
3034
private final DirectoryGenerator directoryGenerator;
@@ -33,6 +37,7 @@ public class MessageQueueClassGenerator extends FileGenerator {
3337
private final CommonBundle commonBundle;
3438
private final String moduleName;
3539
private final GetFirstClassOfFile getFirstClassOfFile;
40+
private final List<String> errors = new ArrayList<>();
3641

3742
/**
3843
* Message queue handler constructor.
@@ -68,40 +73,34 @@ public PsiFile generate(final String actionName) {
6873
);
6974

7075
if (handler != null) {
71-
final String errorMessage = this.validatorBundle.message(
76+
errors.add(validatorBundle.message(
7277
"validator.file.alreadyExists",
7378
"Handler Class"
74-
);
75-
JOptionPane.showMessageDialog(
76-
null,
77-
errorMessage,
78-
commonBundle.message("common.error"),
79-
JOptionPane.ERROR_MESSAGE
80-
);
81-
79+
));
8280
return;
8381
}
84-
8582
handler = createHandlerClass(actionName);
8683

8784
if (handler == null) {
88-
final String errorMessage = this.validatorBundle.message(
85+
errors.add(validatorBundle.message(
8986
"validator.file.cantBeCreated",
9087
"Handler Class"
91-
);
92-
JOptionPane.showMessageDialog(
93-
null,
94-
errorMessage,
95-
commonBundle.message("common.error"),
96-
JOptionPane.ERROR_MESSAGE
97-
);
98-
88+
));
9989
return;
10090
}
10191

10292
handlerFiles[0] = handler.getContainingFile();
10393
});
10494

95+
for (final String errorMessage : errors) {
96+
JOptionPane.showMessageDialog(
97+
null,
98+
errorMessage,
99+
commonBundle.message("common.error"),
100+
JOptionPane.ERROR_MESSAGE
101+
);
102+
}
103+
105104
return handlerFiles[0];
106105
}
107106

0 commit comments

Comments
 (0)