follow application context - still issues versions

Author: tilen1976

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

@@ -51,6 +51,7 @@ public ClassificationFamilyView(ClassificationFacade classificationFacade, UserC
         this.classificationFilter = VaadinUtil.getKlassState().getClassificationFilter();
         UI.getCurrent().getPage().addBrowserWindowResizeListener(event -> updateGrid(event.getWidth()));
         log.info("ClassificationFamilyView initialized with userContext: {} and classification facade {}", userContext, classificationFacade);
+        log.info("ClassificationFamilyView initialized klass state: {}", VaadinUtil.getKlassState());
     }
 
     private void updateGrid(int width) {

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

@@ -23,6 +23,7 @@
 import no.ssb.klass.forvaltning.converting.xml.FullVersionExportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
 
 
 @PrototypeScope
@@ -37,24 +38,28 @@ public class ClassificationListView extends ClassificationListDesign implements
 
     private UserContext userContext;
 
+    private ApplicationContext applicationContext;
+
 
     private final ClassificationFilter classificationFilter;
     private final SharedEscapeShortcutListener sharedEscapeShortcutListener;
 
     private FullVersionExportService exportService;
 
     @Autowired
-    public ClassificationListView(UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService) {
+    public ClassificationListView(UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService, ApplicationContext applicationContext) {
         this.userContext = userContext;
         this.classificationFacade = classificationFacade;
         this.exportService = exportService;
+        this.applicationContext = applicationContext;
         log.info("User context list view {}", userContext);
+        log.info("Application context list view {}", applicationContext);
         sharedEscapeShortcutListener = new SharedEscapeShortcutListener();
         this.classificationFilter = VaadinUtil.getKlassState().getClassificationFilter();
         backButton.addClickListener(e -> VaadinUtil.navigateTo(ClassificationFamilyView.NAME));
         classificationTable.init(versionTable, variantTable, userContext, classificationFacade);
-        versionTable.init(classificationTable, variantTable, userContext, classificationFacade, exportService);
-        variantTable.init(versionTable, userContext);
+        versionTable.init(classificationTable, variantTable, userContext, classificationFacade, exportService, applicationContext);
+        variantTable.init(versionTable, userContext, classificationFacade);
         classificationTable.addToSharedActionListener(sharedEscapeShortcutListener);
         versionTable.addToSharedActionListener(sharedEscapeShortcutListener);
         variantTable.addToSharedActionListener(sharedEscapeShortcutListener);

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

@@ -42,7 +42,8 @@ public class VariantTable extends AbstractTable {
 
     @Autowired
     private ApplicationContext applicationContext;
-    @Autowired
+
+
     private ClassificationFacade classificationFacade;
 
     private UserContext userContext;
@@ -53,8 +54,9 @@ public class VariantTable extends AbstractTable {
     private Button addVariantButton;
 
     @Autowired
-    public void init(VersionTable versionTable, UserContext userContext) {
+    public void init(VersionTable versionTable, UserContext userContext, ClassificationFacade classificationFacade) {
         this.userContext = userContext;
+        this.classificationFacade = classificationFacade;
         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

@@ -51,7 +51,6 @@ public class VersionTable extends AbstractTable {
     private final StreamResource streamResource = new StreamResource(this::generateExportData, "");
     private final FileDownloader fileDownloader = new FileDownloader(streamResource);
 
-    @Autowired
     private ApplicationContext applicationContext;
 
     private ClassificationFacade classificationFacade;
@@ -68,10 +67,11 @@ public class VersionTable extends AbstractTable {
     private ClassificationVersionClickListener classificationVersionClickListener;
 
     @Autowired
-    public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService) {
+    public void init(ClassificationTable classificationTable, VariantTable variantTable, UserContext userContext, ClassificationFacade classificationFacade, FullVersionExportService exportService, ApplicationContext applicationContext) {
         this.userContext = userContext;
         this.classificationFacade = classificationFacade;
         this.exportService = exportService;
+        this.applicationContext = applicationContext;
         classificationVersionClickListener = new ClassificationVersionClickListener(userContext,
                 classificationFacade, variantTable);
         table = createTable(new VersionContainer(userContext, classificationFacade),
@@ -133,7 +133,7 @@ private void copyVersion(ClassificationTable classificationTable) {
 
             NewVersionWindow copyVersionWindow = applicationContext.getBean(NewVersionWindow.class);
             copyVersionWindow.init(classificationTable.getSelectedClassificationId(),
-                    classificationTable.getSelectedClassificationName());
+                    classificationTable.getSelectedClassificationName(), classificationFacade);
             UI.getCurrent().addWindow(copyVersionWindow);
         }
     }

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

@@ -23,28 +23,32 @@
 import no.ssb.klass.designer.service.ClassificationFacade;
 import no.ssb.klass.designer.util.ComponentUtil;
 import no.ssb.klass.designer.windows.AutomaticTranslationWindow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("serial")
 @SpringComponent
 @PrototypeScope
 public class CodeEditorView extends CodeEditorDesign implements HasEditingState {
+    private static final Logger log = LoggerFactory.getLogger(CodeEditorView.class);
 
     private ImportExportComponent<ClassificationVersion> importExportComponent;
     private ClassificationVersion version;
     private final EventBus eventbus;
 
-    @Autowired
     private ApplicationContext context;
 
-    @Autowired
     private ClassificationFacade classificationFacade;
 
-    @Autowired
     private ClassificationVersionXmlService versionXmlService;
 
     private SharedEscapeShortcutListener shortcutListener;
 
-    public CodeEditorView() {
+    @Autowired
+    public CodeEditorView(ApplicationContext context, ClassificationFacade classificationFacade, ClassificationVersionXmlService versionXmlService) {
+        this.context = context;
+        this.classificationFacade = classificationFacade;
+        this.versionXmlService = versionXmlService;
         shortcutListener = new SharedEscapeShortcutListener();
         eventbus = new EventBus("code-editor");
         eventbus.register(primaryCodeTable);
@@ -58,7 +62,7 @@ public CodeEditorView() {
             translationCodeTable.init(eventbus, version, language);
             translationLevels.init(eventbus, version, language);
         });
-
+        log.info("Initializing CodeEditorView");
     }
 
     @Override
@@ -100,7 +104,7 @@ private void deleteExistingItemsBeforeImport(ClassificationVersion version) thro
         }
     }
 
-
+// consider autowired
     public void init(ClassificationVersion version) {
         this.version = version;
         primaryCodeTable.init(eventbus, version, version.getPrimaryLanguage(), classificationFacade);
@@ -120,6 +124,7 @@ public void init(ClassificationVersion version) {
 
         primaryCodeTable.addToSharedActionListener(shortcutListener);
         translationCodeTable.addToSharedActionListener(shortcutListener);
+        log.info("Initializing CodeEditorView version {}", version);
 
     }
 
@@ -138,6 +143,7 @@ private void showTranslations(boolean show) {
     }
 
     private void updatePrimaryLanguageLabel() {
+        log.info("Updating primary language label ()", version);
         primaryLanguage.setValue(version.getPrimaryLanguage().getDisplayName());
     }
 

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

@@ -42,16 +42,18 @@ public class CreateVersionView extends VerticalLayout implements EditingView {
 
     private boolean ignoreChanges = false;
 
-    @Autowired
+
     private ClassificationFacade classificationFacade;
 
-    @Autowired
     private UserContext userContext;
 
     private final VersionEditorView versionEditorView;
     private ClassificationVersion classificationVersion;
 
-    public CreateVersionView() {
+    @Autowired
+    public CreateVersionView( ClassificationFacade classificationFacade, UserContext userContext) {
+        this.classificationFacade = classificationFacade;
+        this.userContext = userContext;
         ConfirmOrCancelComponent actionButtons = new ConfirmOrCancelComponent();
         actionButtons.setConfirmText("Lagre");
         actionButtons.addConfirmClickListener(event -> save());

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

@@ -31,20 +31,22 @@
 @SuppressWarnings("serial")
 public class VersionMainView extends VersionMainEditor implements EditingView {
 
+    // error
     public static final String NAME = "editVersion";
     public static final String PARAM_VERSION_ID = "versionId";
 
     private boolean ignoreChanges = false;
 
-    @Autowired
     private ClassificationFacade classificationFacade;
 
-    @Autowired
     private UserContext userContext;
 
     private PublicationChoiceEditor publicationChoiceEditor;
 
-    public VersionMainView() {
+    @Autowired
+    public VersionMainView(ClassificationFacade classificationFacade, UserContext userContext) {
+        this.classificationFacade = classificationFacade;
+        this.userContext = userContext;
         publicationChoiceEditor = new PublicationChoiceEditor(new MarginInfo(true, false, true, true));
         actionButtons.addConfirmClickListener(event -> checkAndSaveVersion());
         actionButtons.addCancelClickListener(this::cancelClick);

klass-forvaltning/src/main/java/no/ssb/klass/designer/windows/NewVersionWindow.java

@@ -46,7 +46,7 @@ public class NewVersionWindow extends Window {
     private static final String MONTH_PADDING = "mm";
     private static final String YEAR_PADDING = "åååå";
 
-    @Autowired
+    // ?
     private ClassificationFacade classificationFacade;
 
     private LocalDate validFrom;
@@ -59,7 +59,8 @@ public NewVersionWindow() {
         setModal(true);
     }
 
-    public void init(String classificationId, String versionName) {
+    public void init(String classificationId, String versionName, ClassificationFacade classificationFacade) {
+        this.classificationFacade = classificationFacade;
         classificationSeries = classificationFacade.getRequiredClassificationSeries(Long.parseLong(classificationId));
 
         // Label headings part