Skip to content

Commit 493908c

Browse files
committed
Make VersionTableMainView consistent
1 parent f25dd6c commit 493908c

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

klass-forvaltning/src/main/java/no/ssb/klass/designer/editing/version/VersionMainView.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class VersionMainView extends VersionMainEditor implements EditingView {
4141

4242
private boolean ignoreChanges = false;
4343

44-
@Autowired
44+
// From field injection to constructor injection - cbi
4545
private ClassificationFacade classificationFacade;
4646

4747
// From field injection to constructor injection - cbi
@@ -50,16 +50,18 @@ public class VersionMainView extends VersionMainEditor implements EditingView {
5050
private PublicationChoiceEditor publicationChoiceEditor;
5151

5252
// Added versionXmlService and applicationContext
53-
@Autowired
53+
// From field injection to constructor injection - cbi
5454
private ClassificationVersionXmlService versionXmlService;
5555

56-
@Autowired
56+
// From field injection to constructor injection - cbi
5757
private ApplicationContext applicationContext;
5858

5959
@Autowired
60-
public VersionMainView(ClassificationFacade classificationFacade, UserContext userContext) {
60+
public VersionMainView(ClassificationFacade classificationFacade, UserContext userContext, ClassificationVersionXmlService versionXmlService, ApplicationContext applicationContext) {
6161
this.classificationFacade = classificationFacade;
6262
this.userContext = userContext;
63+
this.versionXmlService = versionXmlService;
64+
this.applicationContext = applicationContext;
6365
log.info("User context version main view {}", userContext);
6466
publicationChoiceEditor = new PublicationChoiceEditor(new MarginInfo(true, false, true, true));
6567
actionButtons.addConfirmClickListener(event -> checkAndSaveVersion());

klass-forvaltning/src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ flyway.enabled=false
7070
server.session.timeout=3600
7171
server.connection-timeout=60000
7272
logging.level.com.vaadin=DEBUG
73-
logging.level.org.apache.catalina=DEBUG
74-
logging.level.org.springframework.web=DEBUG
73+
#logging.level.org.apache.catalina=DEBUG
74+
#logging.level.org.springframework.web=DEBUG
7575
server.tomcat.accesslog.enabled=true
7676
#server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D

0 commit comments

Comments
 (0)