Skip to content

Commit 738feb0

Browse files
committed
update xml converter version
1 parent 1b97e59 commit 738feb0

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

klass-forvaltning/src/main/java/no/ssb/klass/designer/ClassificationListView.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import no.ssb.klass.designer.util.ParameterUtil;
2121
import no.ssb.klass.designer.util.VaadinUtil;
2222
import no.ssb.klass.designer.user.UserContext;
23+
import no.ssb.klass.forvaltning.converting.xml.FullVersionExportService;
2324
import org.slf4j.Logger;
2425
import org.slf4j.LoggerFactory;
2526

@@ -40,16 +41,19 @@ public class ClassificationListView extends ClassificationListDesign implements
4041
private final ClassificationFilter classificationFilter;
4142
private final SharedEscapeShortcutListener sharedEscapeShortcutListener;
4243

44+
private FullVersionExportService exportService;
45+
4346
@Autowired
44-
public ClassificationListView(UserContext userContext, ClassificationFacade classificationFacade) {
47+
public ClassificationListView(UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService) {
4548
this.userContext = userContext;
4649
this.classificationFacade = classificationFacade;
50+
this.exportService = exportService;
4751
log.info("User context list view {}", userContext);
4852
sharedEscapeShortcutListener = new SharedEscapeShortcutListener();
4953
this.classificationFilter = VaadinUtil.getKlassState().getClassificationFilter();
5054
backButton.addClickListener(e -> VaadinUtil.navigateTo(ClassificationFamilyView.NAME));
5155
classificationTable.init(versionTable, variantTable, userContext, classificationFacade);
52-
versionTable.init(classificationTable, variantTable, userContext, classificationFacade);
56+
versionTable.init(classificationTable, variantTable, userContext, classificationFacade, exportService);
5357
variantTable.init(versionTable, userContext);
5458
classificationTable.addToSharedActionListener(sharedEscapeShortcutListener);
5559
versionTable.addToSharedActionListener(sharedEscapeShortcutListener);

klass-forvaltning/src/main/java/no/ssb/klass/designer/classificationlist/VersionTable.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public class VersionTable extends AbstractTable {
5858

5959
private UserContext userContext;
6060

61-
@Autowired
6261
private FullVersionExportService exportService;
6362

6463
private Table table;
@@ -69,9 +68,10 @@ public class VersionTable extends AbstractTable {
6968
private ClassificationVersionClickListener classificationVersionClickListener;
7069

7170
@Autowired
72-
public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext, ClassificationFacade classificationFacade) {
71+
public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService) {
7372
this.userContext = userContext;
7473
this.classificationFacade = classificationFacade;
74+
this.exportService = exportService;
7575
classificationVersionClickListener = new ClassificationVersionClickListener(userContext,
7676
classificationFacade, variantTable);
7777
table = createTable(new VersionContainer(userContext, classificationFacade),
@@ -89,6 +89,7 @@ public void init(ClassificationTable classificationTable, VariantTable variantTa
8989
rootLayout.addComponents(createHeader("Versjoner", exportVersionButton, addVersionButton),
9090
wrapFilter(filterBox), table);
9191
rootLayout.setExpandRatio(table, 1);
92+
log.info("Version table initialized {}", this);
9293
}
9394

9495
private InputStream generateExportData() {

0 commit comments

Comments
 (0)