Skip to content

Commit 841008e

Browse files
author
makzef
committed
686: fix uct upgrade command related to module path
1 parent 7394739 commit 841008e

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/com/magento/idea/magento2uct/execution/configurations/UctRunConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,12 @@ public boolean isNewlyCreated() {
263263
commandSettingsBuilder.addArgument("--coming-version=" + getComingVersion());
264264
}
265265

266-
commandSettingsBuilder.addArgument(getProjectRoot());
267-
268266
final GeneralCommandLine commandLine =
269267
commandSettingsBuilder.createGeneralCommandLine();
270268

271269
if (!getModulePath().isEmpty()) {
272270
if (UctModulePathValidatorUtil.validate(getModulePath())) {
273-
commandLine.addParameter("--module-path=".concat(getModulePath()));
271+
commandLine.addParameter(getModulePath());
274272
} else {
275273
throw new ExecutionException("The path to analyse is not valid");
276274
}

src/com/magento/idea/magento2uct/execution/configurations/UctSettingsEditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected void applyEditorTo(final @NotNull UctRunConfiguration uctRunConfigurat
163163
uctRunConfiguration.setProjectRoot(projectRoot.getComponent().getText());
164164
uctRunConfiguration.setModulePath(modulePath.getComponent().getText());
165165

166-
ComboBoxItemData selectedComingVersion
166+
final ComboBoxItemData selectedComingVersion
167167
= getCorrectedSelectedItem(comingVersion.getSelectedItem());
168168

169169
if (selectedComingVersion == null) {
@@ -385,7 +385,7 @@ private void validateComingVersionField(final ComboBoxItemData selectedItem) {
385385

386386
if (selectedItem != null && selectedItem.getKey().isEmpty()) {
387387
comingVersionError.setText("Please, specify target version");
388-
} else if (!matcher.find()) {
388+
} else if (!matcher.find()) { // NOPMD
389389
comingVersionError.setText("Please, correct target version");
390390
} else {
391391
comingVersionError.setText("");

0 commit comments

Comments
 (0)