Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -753,12 +753,24 @@ private void updateIVariables() {
}
}

/** Sanitize the path by removing leading/trailing whitespace and any trailing file separator. */
protected String sanitizePath(String path) {
if (path == null) {
return null;
}
path = path.trim();
while (path.endsWith("/") || path.endsWith("\\")) {
path = path.substring(0, path.length() - 1);
}
return path;
}

private void ok() {
try {
String oriProjectName = projectConfig.getProjectName();
String oriProjectHome = projectConfig.getProjectHome();

String homeFolder = wHome.getText();
String homeFolder = sanitizePath(wHome.getText());
boolean projectHomeFolderChanged = this.editMode && !oriProjectHome.equals(homeFolder);
boolean readOnly = wReadOnly.getSelection();

Expand Down Expand Up @@ -976,7 +988,7 @@ private void getData() {
private void getInfo(Project project, ProjectConfig projectConfig) throws HopException {

projectConfig.setProjectName(wName.getText());
projectConfig.setProjectHome(wHome.getText());
projectConfig.setProjectHome(sanitizePath(wHome.getText()));
projectConfig.setConfigFilename(wConfigFile.getText());
projectConfig.setReadOnly(wReadOnly.getSelection());

Expand Down
Loading