@@ -122,7 +122,7 @@ public static void open(
122
122
* Fire generation process if all fields are valid.
123
123
*/
124
124
private void onOK () {
125
- if (validateFormFields () && isUnderscoreCorrect () ) {
125
+ if (validateFormFields ()) {
126
126
final String [] layoutNameParts = getLayoutNameParts ();
127
127
new LayoutXmlTemplateGenerator (
128
128
new LayoutXmlData (
@@ -188,51 +188,11 @@ private String[] getLayoutNameParts() {
188
188
actionName = layoutNameParts [2 ];
189
189
}
190
190
191
- return new String []{routeName , controllerName , actionName };
192
- }
193
-
194
- /**
195
- * Check is count of underscore is correct in layout name.
196
- *
197
- * @return boolean
198
- */
199
- private boolean isUnderscoreCorrect () {
200
- final String name = layoutName .getText ().trim ();
201
-
202
- if (name .contains ("_" )) {
203
- final int count = countUnderscore (name );
204
-
205
- if (count != 0 && count != 2 ) {
206
- DialogFieldErrorUtil .showErrorMessageForField (
207
- layoutName ,
208
- layoutNameErrorMessage ,
209
- new ValidatorBundle ()
210
- .message ("validator.layoutNameUnderscoreQtyInvalid" )
211
- );
212
-
213
- return false ;
214
- }
191
+ if (layoutNameParts .length == 2 || layoutNameParts .length > 3 ) { // NOPMD
192
+ routeName = layoutName .getText ().trim ();
215
193
}
216
194
217
- return true ;
218
- }
219
-
220
- /**
221
- * Count underscore symbols in string.
222
- *
223
- * @param name String
224
- * @return int
225
- */
226
- private int countUnderscore (final String name ) {
227
- int count = 0 ;
228
-
229
- for (int i = 0 ; i < name .length (); i ++) {
230
- if (name .charAt (i ) == '_' ) { //NOPMD
231
- count ++;
232
- }
233
- }
234
-
235
- return count ;
195
+ return new String []{routeName , controllerName , actionName };
236
196
}
237
197
238
198
/**
0 commit comments