Skip to content

Commit 1ad0c6f

Browse files
committed
Fixed typos and introduced constants
1 parent 1e58b06 commit 1ad0c6f

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public class NewModelsDialog extends AbstractDialog {
5353
private static final String ENTITY_ID_COLUMN_NAME = "Entity ID Column Name";
5454
private static final String COLLECTION_NAME = "Collection Name";
5555
private static final String COLLECTION_DIRECTORY = "Collection Directory";
56+
public static final String RESOURCE_MODEL = "ResourceModel";
57+
public static final String MODEL = "Model";
58+
public static final String FQN_ALIAS_KEYWORD = " as ";
5659

5760
@FieldValidation(rule = RuleRegistry.NOT_EMPTY,
5861
message = {NotEmptyRule.MESSAGE, MODEL_NAME})
@@ -225,18 +228,19 @@ private PsiFile generateModelFile() {
225228
final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace();
226229
final StringBuilder resourceModelFqn
227230
= new StringBuilder(resourceModelNamespace.getClassFqn());
228-
String resorceModelName = getResourceModelName();
231+
String resourceModelName = getResourceModelName();
229232

230233
if (getModelName().equals(getResourceModelName())) {
231-
resourceModelFqn.append(" as ResourceModel");
232-
resorceModelName = "ResourceModel";
234+
resourceModelFqn.append(FQN_ALIAS_KEYWORD);
235+
resourceModelFqn.append(RESOURCE_MODEL);
236+
resourceModelName = RESOURCE_MODEL;
233237
}
234238

235239
return new ModuleModelGenerator(new ModelData(
236240
getModuleName(),
237241
getDbTableName(),
238242
getModelName(),
239-
resorceModelName,
243+
resourceModelName,
240244
modelNamespace.getClassFqn(),
241245
modelNamespace.getNamespace(),
242246
resourceModelFqn.toString()
@@ -263,14 +267,16 @@ private PsiFile generateCollectionFile() {
263267
String modelName = getModelName();
264268
final StringBuilder resourceModelFqn
265269
= new StringBuilder(resourceModelNamespace.getClassFqn());
266-
String resorceModelName = getResourceModelName();
270+
String resourceModelName = getResourceModelName();
267271

268272

269273
if (getModelName().equals(getResourceModelName())) {
270-
modelFqn.append(" as Model");
271-
modelName = "Model";
272-
resourceModelFqn.append(" as ResourceModel");
273-
resorceModelName = "ResourceModel";
274+
modelFqn.append(FQN_ALIAS_KEYWORD);
275+
modelFqn.append(MODEL);
276+
modelName = MODEL;
277+
resourceModelFqn.append(FQN_ALIAS_KEYWORD);
278+
resourceModelFqn.append(RESOURCE_MODEL);
279+
resourceModelName = RESOURCE_MODEL;
274280
}
275281

276282
return new ModuleCollectionGenerator(new CollectionData(
@@ -281,7 +287,7 @@ private PsiFile generateCollectionFile() {
281287
collectionNamespace.getClassFqn(),
282288
getCollectionDirectory(),
283289
collectionNamespace.getNamespace(),
284-
resorceModelName,
290+
resourceModelName,
285291
resourceModelFqn.toString(),
286292
modelFqn.toString()
287293
), project).generate(NewModelsDialog.ACTION_NAME, true);

0 commit comments

Comments
 (0)