Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stabilize #22

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Stabilize #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a1edd0
fix: import dialog not closing after successful import
ivy-rew Nov 14, 2023
a17bd5a
provide full stack trace in log, in case the importer fails
ivy-rew Nov 14, 2023
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
4 changes: 4 additions & 0 deletions excel-importer/src/com/axonivy/util/excel/importer/wizard/ExcelImportProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,14 @@
import ch.ivyteam.ivy.scripting.dataclass.IEntityClass;
import ch.ivyteam.ivy.scripting.dataclass.IProjectDataClassManager;
import ch.ivyteam.ivy.search.restricted.ProjectRelationSearchScope;
import ch.ivyteam.log.Logger;
import ch.ivyteam.util.io.resource.FileResource;
import ch.ivyteam.util.io.resource.nio.NioFileSystemProvider;

public class ExcelImportProcessor implements IWizardSupport, IRunnableWithProgress {

private static final Logger LOGGER = Logger.getLogger(ExcelImportProcessor.class);

private IIvyProject selectedSourceProject;
private FileResource importFile;
private IStatus status = Status.OK_STATUS;
Expand Down Expand Up @@ -122,6 +125,7 @@ private void importExcel(IProjectDataClassManager manager, FileResource excel, I
var entries = importData(sheet, newEntity, pmv);
loaded = entries.size();
} catch (Exception ex) {
LOGGER.error("Excel data import failed", ex);
status = EclipseUtil.createErrorStatus("Loading of Excel data failed", ex);
}
monitor.setTaskName("Loaded Excel rows into Database "+loaded);
Expand Down
3 changes: 2 additions & 1 deletion excel-importer/src/com/axonivy/util/excel/importer/wizard/ExcelImportWizardPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Stream;

Expand Down Expand Up @@ -90,7 +91,7 @@ protected void handleInputChanged() {
}

private void saveDialogSettings() {
List<String> destinations = getImportHistory();
List<String> destinations = new LinkedList<>(getImportHistory());
String path = state.file.getSelection();
String lowerCasePath = path.toLowerCase();
if (destinations.contains(path)) {
Expand Down
Loading