@@ -53,6 +53,9 @@ public class NewModelsDialog extends AbstractDialog {
53
53
private static final String ENTITY_ID_COLUMN_NAME = "Entity ID Column Name" ;
54
54
private static final String COLLECTION_NAME = "Collection Name" ;
55
55
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 " ;
56
59
57
60
@ FieldValidation (rule = RuleRegistry .NOT_EMPTY ,
58
61
message = {NotEmptyRule .MESSAGE , MODEL_NAME })
@@ -225,18 +228,19 @@ private PsiFile generateModelFile() {
225
228
final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace ();
226
229
final StringBuilder resourceModelFqn
227
230
= new StringBuilder (resourceModelNamespace .getClassFqn ());
228
- String resorceModelName = getResourceModelName ();
231
+ String resourceModelName = getResourceModelName ();
229
232
230
233
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 ;
233
237
}
234
238
235
239
return new ModuleModelGenerator (new ModelData (
236
240
getModuleName (),
237
241
getDbTableName (),
238
242
getModelName (),
239
- resorceModelName ,
243
+ resourceModelName ,
240
244
modelNamespace .getClassFqn (),
241
245
modelNamespace .getNamespace (),
242
246
resourceModelFqn .toString ()
@@ -263,14 +267,16 @@ private PsiFile generateCollectionFile() {
263
267
String modelName = getModelName ();
264
268
final StringBuilder resourceModelFqn
265
269
= new StringBuilder (resourceModelNamespace .getClassFqn ());
266
- String resorceModelName = getResourceModelName ();
270
+ String resourceModelName = getResourceModelName ();
267
271
268
272
269
273
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 ;
274
280
}
275
281
276
282
return new ModuleCollectionGenerator (new CollectionData (
@@ -281,7 +287,7 @@ private PsiFile generateCollectionFile() {
281
287
collectionNamespace .getClassFqn (),
282
288
getCollectionDirectory (),
283
289
collectionNamespace .getNamespace (),
284
- resorceModelName ,
290
+ resourceModelName ,
285
291
resourceModelFqn .toString (),
286
292
modelFqn .toString ()
287
293
), project ).generate (NewModelsDialog .ACTION_NAME , true );
0 commit comments