fix variant and versions

Author: tilen1976

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

@@ -49,8 +49,8 @@ public ClassificationListView(UserContext userContext, ClassificationFacade clas
         this.classificationFilter = VaadinUtil.getKlassState().getClassificationFilter();
         backButton.addClickListener(e -> VaadinUtil.navigateTo(ClassificationFamilyView.NAME));
         classificationTable.init(versionTable, variantTable, userContext, classificationFacade);
-        versionTable.init(classificationTable, variantTable, userContext);
-        variantTable.init(versionTable);
+        versionTable.init(classificationTable, variantTable, userContext, classificationFacade);
+        variantTable.init(versionTable, userContext);
         classificationTable.addToSharedActionListener(sharedEscapeShortcutListener);
         versionTable.addToSharedActionListener(sharedEscapeShortcutListener);
         variantTable.addToSharedActionListener(sharedEscapeShortcutListener);

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

@@ -29,27 +29,32 @@
 import no.ssb.klass.designer.util.VaadinUtil;
 import no.ssb.klass.designer.windows.NewCorrespondenceTableWindow;
 import no.ssb.klass.designer.windows.NewVariantWindow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("serial")
 @UIScope
 @SpringComponent
 public class VariantTable extends AbstractTable {
+    private static final Logger log = LoggerFactory.getLogger(VariantTable.class);
     private static final String NEW_CORRESPONDENCE_TABLE_TOOLTIP = "Lag ny korrespondansetabell";
     private static final String NEW_VARIANT_TOOLTIP = "Lag ny variant";
 
     @Autowired
     private ApplicationContext applicationContext;
     @Autowired
     private ClassificationFacade classificationFacade;
-    @Autowired
+
     private UserContext userContext;
 
     private Table table;
     private TextField filterBox;
     private Button addCorrespondenceButton;
     private Button addVariantButton;
 
-    public void init(VersionTable versionTable) {
+    @Autowired
+    public void init(VersionTable versionTable, UserContext userContext) {
+        this.userContext = userContext;
         table = createTable(new VariantContainer(userContext, classificationFacade, versionTable));
         table.setColumnExpandRatio(AbstractPropertyContainer.NAME, 1);
         addCorrespondenceButton = createAddElementButton(NEW_CORRESPONDENCE_TABLE_TOOLTIP);

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

@@ -36,11 +36,15 @@
 import no.ssb.klass.core.util.AlphaNumericalComparator;
 import no.ssb.klass.designer.util.VaadinUtil;
 import no.ssb.klass.designer.windows.NewVersionWindow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("serial")
 @UIScope
 @SpringComponent
 public class VersionTable extends AbstractTable {
+
+    private static final Logger log = LoggerFactory.getLogger(VersionTable.class);
     private static final String COPY_VERSION_TOOLTIP = "Lag ny versjon av valgt kodeverk";
     private static final String EXPORT_VERSION_TOOLTIP = "Eksporter valgt kodeverk";
 
@@ -49,7 +53,7 @@ public class VersionTable extends AbstractTable {
 
     @Autowired
     private ApplicationContext applicationContext;
-    @Autowired
+
     private ClassificationFacade classificationFacade;
 
     private UserContext userContext;
@@ -65,8 +69,9 @@ public class VersionTable extends AbstractTable {
     private ClassificationVersionClickListener classificationVersionClickListener;
 
     @Autowired
-    public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext) {
+    public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext, ClassificationFacade classificationFacade) {
         this.userContext = userContext;
+        this.classificationFacade = classificationFacade;
         classificationVersionClickListener = new ClassificationVersionClickListener(userContext,
                 classificationFacade, variantTable);
         table = createTable(new VersionContainer(userContext, classificationFacade),
@@ -164,7 +169,7 @@ public void itemClick(ItemClickEvent event) {
         private List<ClassificationEntityOperations> getListOfVariantsAndCorrespondenceTables(
                 ClassificationVersion version) {
             List<ClassificationEntityOperations> entities = new LinkedList<>();
-
+            log.info("Classification facade version table {}", classificationFacade);
             List<CorrespondenceTable> sourceList = classificationFacade.findCorrespondenceTablesWithSource(version)
                     .stream()
                     .sorted(AlphaNumericalComparator.comparing(ClassificationEntityOperations::getNameInPrimaryLanguage,