Merge with main

InAnYan · Oct 6, 2024 · bcb0d34 · bcb0d34
1 parent afd3bb3
commit bcb0d34
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 16 deletions.
diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -153,7 +153,6 @@ public JabRefFrame(Stage mainStage,
         this.sidePane = new SidePane(
                 this,
                 this.preferences,
-                aiService,
                 Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
                 taskExecutor,
                 dialogService,

diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -33,7 +33,6 @@ public class SidePane extends VBox {
 
     public SidePane(LibraryTabContainer tabContainer,
                     GuiPreferences preferences,
-                    AiService aiService,
                     JournalAbbreviationRepository abbreviationRepository,
                     TaskExecutor taskExecutor,
                     DialogService dialogService,
@@ -48,7 +47,6 @@ public SidePane(LibraryTabContainer tabContainer,
         this.viewModel = new SidePaneViewModel(
                 tabContainer,
                 preferences,
-                aiService,
                 abbreviationRepository,
                 stateManager,
                 taskExecutor,

diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -22,7 +22,6 @@
 public class SidePaneContentFactory {
     private final LibraryTabContainer tabContainer;
     private final GuiPreferences preferences;
-    private final AiService aiService;
     private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
@@ -35,7 +34,6 @@ public class SidePaneContentFactory {
 
     public SidePaneContentFactory(LibraryTabContainer tabContainer,
                                   GuiPreferences preferences,
-                                  AiService aiService,
                                   JournalAbbreviationRepository abbreviationRepository,
                                   TaskExecutor taskExecutor,
                                   DialogService dialogService,
@@ -47,7 +45,6 @@ public SidePaneContentFactory(LibraryTabContainer tabContainer,
                                   UndoManager undoManager) {
         this.tabContainer = tabContainer;
         this.preferences = preferences;
-        this.aiService = aiService;
         this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;

diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -42,7 +42,6 @@ public class SidePaneViewModel extends AbstractViewModel {
 
     public SidePaneViewModel(LibraryTabContainer tabContainer,
                              GuiPreferences preferences,
-                             AiService aiService,
                              JournalAbbreviationRepository abbreviationRepository,
                              StateManager stateManager,
                              TaskExecutor taskExecutor,
@@ -58,7 +57,6 @@ public SidePaneViewModel(LibraryTabContainer tabContainer,
         this.sidePaneContentFactory = new SidePaneContentFactory(
                 tabContainer,
                 preferences,
-                aiService,
                 abbreviationRepository,
                 taskExecutor,
                 dialogService,

diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -1,13 +1,9 @@
 package org.jabref.logic.ai.summarization;
 
-import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.Optional;
-import java.util.TreeMap;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
+import java.util.TreeMap;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;

diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -38,7 +38,6 @@ class SidePaneViewModelTest {
 
     LibraryTabContainer tabContainer = mock(LibraryTabContainer.class);
     GuiPreferences preferences = mock(GuiPreferences.class);
-    AiService aiService = mock(AiService.class);
     JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
     StateManager stateManager = mock(StateManager.class);
     TaskExecutor taskExecutor = mock(TaskExecutor.class);
@@ -68,7 +67,6 @@ void setUp() {
         sidePaneViewModel = new SidePaneViewModel(
                 tabContainer,
                 preferences,
-                aiService,
                 abbreviationRepository,
                 stateManager,
                 taskExecutor,