Skip to content

Commit ba77f2f

Browse files
committed
revert changes
1 parent 4411fb2 commit ba77f2f

3 files changed

Lines changed: 18 additions & 17 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,4 @@ The project consists of the following modules:
144144
- [**sormas-serverlibs:**](/sormas-serverlibs) Dependencies to be deployed with the payara server
145145
- [**sormas-ui:**](/sormas-ui) The web application
146146
- [**sormas-widgetset:**](/sormas-widgetset) The GWT widgetset generated by Vaadin
147-
- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface
147+
- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface

sormas-api/src/test/resources/logback-test.xml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@
66
<!-- allow JMX configuration (http://logback.qos.ch/manual/jmxConfig.html) -->
77
<!-- <jmxConfigurator /> -->
88

9-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
10-
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
11-
<Pattern>%date %-5level \(%C.java:%L\) - %msg%n</Pattern>
9+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
10+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
11+
<Pattern>%date %-5level \(%C.java:%L\) - %msg%n</Pattern>
1212
</encoder>
13-
</appender>
14-
<logger name="de.symeda.sormas" level="ERROR"/>
13+
</appender>
1514

16-
<root level="warn">
17-
<appender-ref ref="STDOUT"/>
18-
</root>
19-
<!-- Don't log ArchUnit internal debug logs -->
20-
<logger name="com.tngtech.archunit" level="WARN"/>
15+
<!-- Don't log ArchUnit internal debug logs -->
16+
<logger name="com.tngtech.archunit" level="WARN" />
2117

2218
<root level="warn">
23-
<appender-ref ref="STDOUT"/>
19+
<appender-ref ref="STDOUT" />
2420
</root>
2521

2622
</configuration>

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
public class ImportSurveyTokensLayout extends AbstractImportLayout {
3636

37+
3738
public ImportSurveyTokensLayout(SurveyDto survey) {
3839
super();
3940
SurveyTokenFacade surveyTokenFacade = FacadeProvider.getSurveyTokenFacade();
@@ -47,14 +48,18 @@ public ImportSurveyTokensLayout(SurveyDto survey) {
4748
addImportCsvComponent(3, new ImportReceiver(fileNameAddition, file -> {
4849
resetDownloadErrorReportButton();
4950
try {
50-
DataImporter importer = new SurveyTokenImporter(file, currentUser, survey, (ValueSeparator) separator.getValue());
51+
DataImporter importer = new SurveyTokenImporter(
52+
file,
53+
currentUser,
54+
survey,
55+
(ValueSeparator) separator.getValue());
5156
importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
5257
} catch (IOException | CsvValidationException e) {
5358
new Notification(
54-
I18nProperties.getString(Strings.headingImportFailed),
55-
I18nProperties.getString(Strings.messageImportFailed),
56-
Notification.Type.ERROR_MESSAGE,
57-
false).show(Page.getCurrent());
59+
I18nProperties.getString(Strings.headingImportFailed),
60+
I18nProperties.getString(Strings.messageImportFailed),
61+
Notification.Type.ERROR_MESSAGE,
62+
false).show(Page.getCurrent());
5863
}
5964
}));
6065
addDownloadErrorReportComponent(4);

0 commit comments

Comments
 (0)