Moved createLogERntryFromSelectipn from Context Menu to New Log Entry Button

Author: milenaschedle

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryDisplayController.java

@@ -38,10 +38,12 @@
 import org.phoebus.logbook.LogEntry;
 import org.phoebus.logbook.olog.ui.write.EditMode;
 import org.phoebus.logbook.olog.ui.write.LogEntryEditorStage;
+import org.phoebus.logbook.olog.ui.write.LogEntryUtils;
 import org.phoebus.olog.es.api.model.LogGroupProperty;
 import org.phoebus.olog.es.api.model.OlogLog;
 import org.phoebus.ui.javafx.ImageCache;
 
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -184,12 +186,6 @@ public void reply() {
         new LogEntryEditorStage(new OlogLog(),  logEntryProperty.get(), EditMode.NEW_LOG_ENTRY).show();
     }
 
-    @FXML
-    public void newLogEntry(){
-        // Show a new editor dialog.
-        new LogEntryEditorStage(new OlogLog(),  null, EditMode.NEW_LOG_ENTRY).show();
-    }
-
     @FXML
     public void goBack() {
         if (logEntryTableViewController.goBackAndGoForwardActions.isPresent()) {
@@ -204,6 +200,22 @@ public void goForward() {
         }
     }
 
+    /**
+     * Creates a new Log Entry.
+     * If 2 or more existing Log Entries in the list are selected,
+     * they get linked into the description of the new Log Entry.
+     * */
+    @FXML
+    public void createNewLogEntry(){
+        List<LogEntry> selectedLogEntries = logEntryTableViewController.getSelectedLogEntries();
+        if (selectedLogEntries.size() > 1){
+            LogEntry logEntry = LogEntryUtils.createLogEntryFromList(LogbookUIPreferences.web_client_root_URL, selectedLogEntries);
+            new LogEntryEditorStage(logEntry,null, EditMode.NEW_LOG_ENTRY_FROM_SELECTION).show();
+        } else {
+            new LogEntryEditorStage(new OlogLog(),  null, EditMode.NEW_LOG_ENTRY).show();
+        }
+    }
+
     /**
      * Sets/renders the {@link LogEntry} in the view unless already rendered or unedited.
      * @param logEntry A non-null {@link LogEntry}

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java

@@ -215,14 +215,7 @@ public void initialize() {
         menuItemUpdateLogEntry.acceleratorProperty().setValue(new KeyCodeCombination(KeyCode.U, KeyCombination.CONTROL_DOWN));
         menuItemUpdateLogEntry.setOnAction(ae -> new LogEntryEditorStage(selectedLogEntries.get(0), null, EditMode.UPDATE_LOG_ENTRY).show());
 
-        //Milena
-        MenuItem menuItemCreateLogEntryFromSelection = new MenuItem(Messages.CreateLogEntryFromSelection);
-        menuItemCreateLogEntryFromSelection.setOnAction(pl -> {
-            LogEntry logEntry = LogEntryUtils.createLogEntryFromList(LogbookUIPreferences.web_client_root_URL, selectedLogEntries);
-            new LogEntryEditorStage(logEntry, null, EditMode.NEW_LOG_ENTRY_FROM_SELECTION).show();
-        });
-
-        contextMenu.getItems().addAll(groupSelectedEntries, menuItemShowHideAll, menuItemNewLogEntry, menuItemCreateLogEntryFromSelection);
+        contextMenu.getItems().addAll(groupSelectedEntries, menuItemShowHideAll, menuItemNewLogEntry);
         if (LogbookUIPreferences.log_entry_update_support) {
             contextMenu.getItems().add(menuItemUpdateLogEntry);
         }
@@ -599,6 +592,11 @@ public OlogQuery fromString(String s) {
 
     }
 
+
+    public List<LogEntry> getSelectedLogEntries(){
+        return selectedLogEntries;
+    }
+
     /**
      * Wrapper class for a {@link LogEntry} and a flag indicating whether details of the
      * log entry meta-data should be rendered in the list view.

app/logbook/olog/ui/src/main/resources/org/phoebus/logbook/olog/ui/LogEntryDisplay.fxml

@@ -28,7 +28,7 @@
     <top>
         <ToolBar fx:id="toolBar">
             <items>
-                <Button fx:id="newLogEntryButton" mnemonicParsing="false" onAction="#newLogEntry" text="%NewLogEntry"/>
+                <Button fx:id="newLogEntryButton" mnemonicParsing="false" onAction="#createNewLogEntry" text="%NewLogEntry"/>
                 <Button fx:id="replyButton" mnemonicParsing="false" onAction="#reply" text="%Reply" disable="true"/>
                 <ToggleButton fx:id="showHideLogEntryGroupButton" contentDisplay="RIGHT" mnemonicParsing="false"
                               text="%ShowHideLogEntryGroup" disable="true" onAction="#showHideLogEntryGroup"/>