Skip to content
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

Bug-667: Fixed dialog disposition issue #811

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Bug-667: Fixed dialog disposition issue #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,18 @@ protected void centerDialog(final AbstractDialog dialog) {
dialog.setLocation(coordinateX, coordinateY);
}

/**
* Default on cancel action.
*/
protected void onCancel() {
this.setVisible(false);
this.exit();
}

/**
* Right way to hide dialog window.
*/
protected void exit() {
dispose();
}

/**
Expand Down
44 changes: 21 additions & 23 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 @@ -157,30 +157,28 @@ private void fillTargetAreaOptions() {
}

protected void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
new PluginClassGenerator(new PluginFileData(
getPluginDirectory(),
getPluginClassName(),
getPluginType(),
getPluginModule(),
targetClass,
targetMethod,
getPluginClassFqn(),
getNamespace()
), project).generate(CreateAPluginAction.ACTION_NAME, true);

new PluginDiXmlGenerator(new PluginDiXmlData(
getPluginArea(),
getPluginModule(),
targetClass,
getPluginSortOrder(),
getPluginName(),
getPluginClassFqn()
), project).generate(CreateAPluginAction.ACTION_NAME);
}
new PluginClassGenerator(new PluginFileData(
getPluginDirectory(),
getPluginClassName(),
getPluginType(),
getPluginModule(),
targetClass,
targetMethod,
getPluginClassFqn(),
getNamespace()
), project).generate(CreateAPluginAction.ACTION_NAME, true);

new PluginDiXmlGenerator(new PluginDiXmlData(
getPluginArea(),
getPluginModule(),
targetClass,
getPluginSortOrder(),
getPluginName(),
getPluginClassFqn()
), project).generate(CreateAPluginAction.ACTION_NAME);

this.setVisible(false);
exit();
}

public String getPluginName() {
Expand Down
38 changes: 18 additions & 20 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 @@ -150,27 +150,25 @@ private void fillTargetAreaOptions() {
* Perform code generation using input data.
*/
private void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
new ObserverClassGenerator(new ObserverFileData(
getObserverDirectory(),
getObserverClassName(),
getObserverModule(),
targetEvent,
getObserverClassFqn(),
getNamespace()
), project).generate(CreateAnObserverAction.ACTION_NAME, true);

new ObserverEventsXmlGenerator(new ObserverEventsXmlData(
getObserverArea(),
getObserverModule(),
targetEvent,
getObserverName(),
getObserverClassFqn()
), project).generate(CreateAPluginAction.ACTION_NAME);
}
new ObserverClassGenerator(new ObserverFileData(
getObserverDirectory(),
getObserverClassName(),
getObserverModule(),
targetEvent,
getObserverClassFqn(),
getNamespace()
), project).generate(CreateAnObserverAction.ACTION_NAME, true);

new ObserverEventsXmlGenerator(new ObserverEventsXmlData(
getObserverArea(),
getObserverModule(),
targetEvent,
getObserverName(),
getObserverClassFqn()
), project).generate(CreateAPluginAction.ACTION_NAME);

this.setVisible(false);
exit();
}

public String getObserverClassName() {
Expand Down
6 changes: 4 additions & 2 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/InjectAViewModelDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ protected void updateArgumentText() {

protected void onOK() {
if (!validateFormFields()) {
exit();
return;
}
final String moduleName = GetModuleNameByDirectoryUtil.execute(
Expand Down Expand Up @@ -168,6 +169,7 @@ protected void onOK() {
JOptionPane.ERROR_MESSAGE
);

exit();
return;
}

Expand All @@ -176,9 +178,9 @@ protected void onOK() {
this.getViewModelArgumentName(),
XsiTypes.object.toString(),
namespaceBuilder.getClassFqn()
).generate(targetBlockTag);
).generate(targetBlockTag);

this.setVisible(false);
exit();
}

public String getViewModelClassName() {
Expand Down
7 changes: 3 additions & 4 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@ public static void open(final Project project, final PsiDirectory directory) {
}

protected void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateFile();
}
generateFile();
this.setVisible(false);
exit();
}

private PsiFile generateFile() {
Expand Down
7 changes: 3 additions & 4 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,10 @@ public String getCLICommandClassFqn() {
}

private void onOK() {
if (!validateFormFields() || !isPHPClassValid()) {
return;
if (validateFormFields() && isPHPClassValid()) {
this.generate();
}
this.generate();
this.setVisible(false);
exit();
}

private Boolean isPHPClassValid() {
Expand Down
8 changes: 3 additions & 5 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,10 @@ public static void open(final Project project, final PsiDirectory directory) {
}

private void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateFile();
}

generateFile();
this.setVisible(false);
exit();
}

/**
Expand Down
8 changes: 3 additions & 5 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronGroupDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,10 @@ public static void open(final Project project, final PsiDirectory directory) {
}

private void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateFile();
}

generateFile();
this.setVisible(false);
exit();
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronjobDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ private String suggestCronjobName(final String cronjobClassname) {
*/
private void onOK() {
if (!validateFormFields()) {
exit();
return;
}

Expand All @@ -298,7 +299,7 @@ private void onOK() {

// todo: catch validation exceptions
this.generate(cronjobClassData, crontabXmlData);
this.setVisible(false);
exit();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ private void onOK() {
generateDataModelInterfaceFile();
generatePreferenceForInterface();
}
this.setVisible(false);
}
exit();
}

@Override
Expand Down
25 changes: 11 additions & 14 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,18 @@ private void onOK() {
columnsTable.getCellEditor().stopCellEditing();
}

if (!validateFormFields()) {
return;
if (validateFormFields()) {
final DbSchemaXmlData dbSchemaXmlData = new DbSchemaXmlData(
getTableName(),
getTableResource(),
getTableEngine(),
getTableComment(),
getColumns()
);
generateDbSchemaXmlFile(dbSchemaXmlData);
generateWhitelistJsonFile(dbSchemaXmlData);
}

final DbSchemaXmlData dbSchemaXmlData = new DbSchemaXmlData(
getTableName(),
getTableResource(),
getTableEngine(),
getTableComment(),
getColumns()
);
generateDbSchemaXmlFile(dbSchemaXmlData);
generateWhitelistJsonFile(dbSchemaXmlData);

this.setVisible(false);
exit();
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,14 @@ private String getModuleName() {

private void onOK() {
final boolean emailTemplateCanBeDeclared = !this.validator.validate(this);

if (!validateFormFields() || emailTemplateCanBeDeclared) {
exit();
return;
}

generateFile();
this.setVisible(false);

exit();
}

private void generateFile() {
Expand Down
2 changes: 1 addition & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ private void releaseDialogAfterGeneration() {
buttonOK.setEnabled(true);

if (onOkActionFired.isFinished()) {
this.setVisible(false);
exit();
}
}

Expand Down
7 changes: 3 additions & 4 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,10 @@ public static void open(final Project project, final PsiDirectory directory) {
}

protected void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateFile();
}
generateFile();
this.setVisible(false);
exit();
}

private PsiFile generateFile() {
Expand Down
18 changes: 8 additions & 10 deletions ...m/magento/idea/magento2plugin/actions/generation/dialog/NewInterfaceForServiceDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,15 @@ private void fillPredefinedValuesAndDisableInputs() {
* Fire generation process if all fields are valid.
*/
private void onOK() {
if (!validateFormFields()) {
return;
}
final WebApiInterfaceData data = getDialogDataObject();
if (validateFormFields()) {
final WebApiInterfaceData data = getDialogDataObject();

new WebApiInterfaceGenerator(
data,
project
).generate(NewWebApiInterfaceAction.ACTION_NAME, true);

this.setVisible(false);
new WebApiInterfaceGenerator(
data,
project
).generate(NewWebApiInterfaceAction.ACTION_NAME, true);
}
exit();
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/NewMessageQueueDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,12 @@ private void onOK() {
generateTopology();
generatePublisher();
generateHandlerClass();

if (getConnectionName().equals(MessageQueueConnections.DB.getType())) {
generateConsumerClass();
}
this.setVisible(false);
}
exit();
}

private void generateCommunication() {
Expand Down
13 changes: 5 additions & 8 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModelsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,12 @@ protected void onCancel() {
* Process generation.
*/
private void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateModelFile();
generateResourceModelFile();
generateCollectionFile();
}

generateModelFile();
generateResourceModelFile();
generateCollectionFile();

this.setVisible(false);
exit();
}

/**
Expand Down
7 changes: 3 additions & 4 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,10 @@ private void detectPackageName(final @NotNull PsiDirectory initialBaseDir) {
}

protected void onOK() {
if (!validateFormFields()) {
return;
if (validateFormFields()) {
generateFiles();
}
generateFiles();
this.setVisible(false);
exit();
}

private void generateFiles() {
Expand Down
Loading