Merge branch 'master' into markdown-properties-docs

Author: shroffk

app/display/editor/src/main/java/org/csstudio/display/builder/editor/actions/ActionDescription.java

@@ -506,7 +506,7 @@ public void run(final DisplayEditor editor, final boolean selected)
                                           .mapToInt(w -> w.propWidth().getValue())
                                           .sum();
 
-            final int offset = ( max - min - totalWidth ) / ( N - 1 );
+            final double offset = (double) (max - min - totalWidth) / (double) (N - 1);
             final List<Widget> sortedWidgets = widgets.stream()
                                                       .sorted(( w1, w2 ) ->
             {
@@ -550,15 +550,15 @@ else if ( w1x >= w2x && w1x + w1w >= w2x + w2w )
                 //  Equal gap distribution...
                 //  ------------------------------------------------------------
                 Widget widget = sortedWidgets.get(0);
-                int location = widget.propX().getValue();
+                double location = (double) widget.propX().getValue();
                 int width = widget.propWidth().getValue();
 
                 for ( int i = 1; i < N - 1; i++ )
                 {
                     widget = sortedWidgets.get(i);
                     location += width + offset;
 
-                    undo.execute(new SetWidgetPropertyAction<>(widget.propX(), location));
+                    undo.execute(new SetWidgetPropertyAction<>(widget.propX(), (int) Math.round(location)));
 
                     width = widget.propWidth().getValue();
                 }
@@ -575,20 +575,20 @@ else if ( offset < 0 )
                 int location = widget.propX().getValue();
                 int width = widget.propWidth().getValue();
 
-                final int rightCenter = location + width / 2;
+                final double rightCenter = (double) location + (double) width / 2.0;
 
                 widget = sortedWidgets.get(0);
                 location = widget.propX().getValue();
                 width = widget.propWidth().getValue();
 
                 final int leftCenter = location + width / 2;
-                final int coffset = ( rightCenter - leftCenter ) /  ( N - 1 );
+                final double coffset = (rightCenter - (double) leftCenter) / (double) (N - 1);
 
                 for ( int i = 1; i < N - 1; i++ )
                 {
                     widget = sortedWidgets.get(i);
                     width = widget.propWidth().getValue();
-                    undo.execute(new SetWidgetPropertyAction<>(widget.propX(), ( leftCenter + i * coffset ) - width / 2));
+                    undo.execute(new SetWidgetPropertyAction<>(widget.propX(), (int) Math.round((leftCenter + (double) i * coffset - (double) width / 2.0))));
                 }
             }
         }
@@ -620,7 +620,7 @@ public void run(final DisplayEditor editor, final boolean selected)
                                            .mapToInt(w -> w.propHeight().getValue())
                                            .sum();
 
-            final int offset = ( max - min - totalHeight ) / ( N - 1 );
+            final double offset = (double) (max - min - totalHeight ) / (double) (N - 1);
             final List<Widget> sortedWidgets = widgets.stream()
                                                       .sorted(( w1, w2 ) ->
             {
@@ -680,14 +680,14 @@ else if ( w1y >= w2y && w1y + w1h >= w2y + w2h )
                 //  Equal gap distribution...
                 //  ------------------------------------------------------------
                 Widget widget = sortedWidgets.get(0);
-                int location = widget.propY().getValue();
+                double location = widget.propY().getValue();
                 int height = widget.propHeight().getValue();
 
                 for ( int i = 1; i < N - 1; i++ )
                 {
                     widget = sortedWidgets.get(i);
                     location += height + offset;
-                    undo.execute(new SetWidgetPropertyAction<>(widget.propY(), location));
+                    undo.execute(new SetWidgetPropertyAction<>(widget.propY(), (int) Math.round(location)));
                     height = widget.propHeight().getValue();
                 }
             }
@@ -703,19 +703,19 @@ else if ( offset < 0 )
                 int location = widget.propY().getValue();
                 int height = widget.propHeight().getValue();
 
-                final int bottomCenter = location + height / 2;
+                final double bottomCenter = (double) location + (double) height / 2.0;
 
                 widget = sortedWidgets.get(0);
                 location = widget.propY().getValue();
                 height = widget.propHeight().getValue();
 
-                final int topCenter = location + height / 2;
-                final int coffset = ( bottomCenter - topCenter ) /  ( N - 1 );
+                final double topCenter = (double) location + (double) height / 2.0;
+                final double coffset = (bottomCenter - topCenter) / (double) (N - 1);
                 for ( int i = 1; i < N - 1; i++ )
                 {
                     widget = sortedWidgets.get(i);
                     height = widget.propHeight().getValue();
-                    undo.execute(new SetWidgetPropertyAction<>(widget.propY(), ( topCenter + i * coffset ) - height / 2));
+                    undo.execute(new SetWidgetPropertyAction<>(widget.propY(), (int) Math.round((topCenter + (double) i * coffset - (double) height / 2.0))));
                 }
             }
         }

app/display/model/src/main/resources/display_model_preferences.properties

@@ -107,4 +107,4 @@ enable_saved_on_comments=false
 # increase in memory consumption. E.g., by setting the SVG rendering resolution factor to 2.0, an
 # SVG can be rendered at twice the width and twice the height, but the memory required to
 # represent the image grows by a factor of four.
-org.csstudio.display.builder.model/enable_svg_rendering_resolution_factor=false
+enable_svg_rendering_resolution_factor=false

app/display/model/src/main/resources/org/csstudio/display/builder/model/messages.properties

@@ -41,10 +41,10 @@ GroupWidget_Description=Group of widgets
 GroupWidget_Name=Group
 HighlightActiveRegion=Highlight Active Region
 InformativeTooltipActions=Actions to execute when the widget is clicked on.
-InformativeTooltopAlarmBorder=Should an alarm border be shown around the widget when the displayed PV signals an alarm?
+InformativeTooltipAlarmBorder=Should an alarm border be shown around the widget when the displayed PV signals an alarm?
 InformativeTooltipHeight=The height of the widget in pixels.
 InformativeTooltipName=The name of the widget.
-InformativTooltipPVName=The name of the PV to connect to and to display in the widget.
+InformativeTooltipPVName=The name of the PV to connect to and to display in the widget.
 InformativeTooltipRules=Rules associated with the widget.
 InformativeTooltipScripts=Scripts associated with the widget.
 InformativeTooltipTooltip=Text to display in the tooltip of the widget when hovering with the mouse over the widget.

app/display/representation-javafx/pom.xml

@@ -20,11 +20,6 @@
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.5</version>
-    </dependency>
     <dependency>
       <groupId>org.controlsfx</groupId>
       <artifactId>controlsfx</artifactId>

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/JFXRepresentation.java

@@ -516,7 +516,7 @@ else if (scrollBar.isVisible() && scrollBar.getOrientation() == Orientation.VERT
                 // correct width/height properties.
                 final double zoomXWithoutScrollbars, zoomYWithoutScrollbars;
                 final double zoomXWithScrollbars, zoomYWithScrollbars;
-                if (outline.getWidth() > layoutBoundsWithScrollbars.getWidth()) {
+                if (outline.getWidth() > layoutBoundsWithoutScrollbars.getWidth()) {
                     zoomXWithoutScrollbars = layoutBoundsWithoutScrollbars.getWidth() / outline.getWidth();
                     zoomXWithScrollbars = layoutBoundsWithScrollbars.getWidth() / outline.getWidth();
                 }
@@ -529,7 +529,7 @@ else if (model.propWidth().getValue() > 0) {
                     zoomXWithScrollbars = 1.0;
                 }
 
-                if (outline.getHeight() > layoutBoundsWithScrollbars.getHeight()) {
+                if (outline.getHeight() > layoutBoundsWithoutScrollbars.getHeight()) {
                     zoomYWithoutScrollbars = layoutBoundsWithoutScrollbars.getHeight() / outline.getHeight();
                     zoomYWithScrollbars = layoutBoundsWithScrollbars.getHeight() / outline.getHeight();
                 }

app/logbook/olog/client-es/src/main/java/org/phoebus/olog/es/api/OlogHttpClient.java

@@ -260,9 +260,14 @@ private SearchResult findLogs(MultivaluedMap<String, String> searchParams) throw
                 .build();
         try {
             HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-            OlogSearchResult searchResult = OlogObjectMappers.logEntryDeserializer.readValue(response.body(), OlogSearchResult.class);
-            return SearchResult.of(new ArrayList<>(searchResult.getLogs()),
-                    searchResult.getHitCount());
+            if(response.statusCode() == 200) {
+                OlogSearchResult searchResult = OlogObjectMappers.logEntryDeserializer.readValue(response.body(), OlogSearchResult.class);
+                return SearchResult.of(new ArrayList<>(searchResult.getLogs()),
+                        searchResult.getHitCount());
+            }
+            else{
+                throw new RuntimeException(response.body());
+            }
         } catch (Exception e) {
             LOGGER.log(Level.WARNING, "failed to retrieve log entries", e);
             throw new RuntimeException(e);

app/logbook/olog/ui/doc/index.rst

@@ -22,6 +22,12 @@ Features
 
 - Log entry viewers offer search capabilities based on meta data and content.
 
+Missing features
+----------------
+In contrast to other markup implementations, HTML tags are **not** supported. Any such tags entered by user will
+be rendered as plain text.
+
+
 Launching the log entry editor
 ------------------------------
 

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

@@ -29,30 +29,38 @@
 
 public class HtmlAwareController {
 
-    private Parser parser;
-    private HtmlRenderer htmlRenderer;
+    private final Parser parser;
+    private final HtmlRenderer htmlRenderer;
 
+    /**
+     * Constructor to generate html code for HTML preview feature in LogEntryEditor or detailed log entry view.
+     * @param serviceUrl Olog service url
+     */
     public HtmlAwareController(String serviceUrl){
-        List<Extension> extensions =
-                Arrays.asList(TablesExtension.create(), ImageAttributesExtension.create());
-        this.parser = Parser.builder().extensions(extensions).build();
-        htmlRenderer = HtmlRenderer.builder()
-                .attributeProviderFactory(context -> new OlogAttributeProvider(serviceUrl))
-                .extensions(extensions).build();
+       this(new OlogAttributeProvider(serviceUrl));
     }
 
     /**
-     * To create HtmlAwareController object to generate html code for HTML preview feature in LogEntryEditor.
+     * Constructor to generate html code for HTML preview feature in LogEntryEditor or detailed log entry view.
      * @param serviceUrl Olog service url.
      * @param preview Set true when preview button is clicked.
      * @param attachments The current attachments list from AttachmentsEditorController.
      */
     public HtmlAwareController(String serviceUrl, boolean preview, List<Attachment> attachments){
+       this(new OlogAttributeProvider(serviceUrl, preview, attachments));
+    }
+
+    /**
+     * Private constructor to avoid code duplication.
+     * @param ologAttributeProvider The {@link OlogAttributeProvider} particular to the use case.
+     */
+    private HtmlAwareController(OlogAttributeProvider ologAttributeProvider){
         List<Extension> extensions =
                 Arrays.asList(TablesExtension.create(), ImageAttributesExtension.create());
         this.parser = Parser.builder().extensions(extensions).build();
         htmlRenderer = HtmlRenderer.builder()
-                .attributeProviderFactory(context -> new OlogAttributeProvider(serviceUrl, preview, attachments))
+                .escapeHtml(true)
+                .attributeProviderFactory(context -> ologAttributeProvider)
                 .extensions(extensions).build();
     }
 

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

@@ -34,6 +34,7 @@
 import org.phoebus.logbook.SearchResult;
 import org.phoebus.logbook.olog.ui.query.OlogQuery;
 import org.phoebus.logbook.olog.ui.query.OlogQueryManager;
+import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
 
 import java.net.URL;
 import java.time.LocalDateTime;
@@ -262,7 +263,8 @@ public void search() {
                 },
                 (msg, ex) -> {
                     searchInProgress.set(false);
-                });
+                    ExceptionDetailsErrorDialog.openError(agenda, Messages.SearchFailed, "", ex);
+        });
     }
 
     public String getQuery() {

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

@@ -25,6 +25,7 @@
 import javafx.scene.control.Pagination;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SplitPane;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
@@ -60,6 +61,7 @@
 import org.phoebus.security.store.SecureStore;
 import org.phoebus.security.tokens.ScopedAuthenticationToken;
 import org.phoebus.ui.dialog.DialogHelper;
+import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -88,6 +90,10 @@ public class LogEntryTableViewController extends LogbookSearchController impleme
     @SuppressWarnings("unused")
     private GridPane viewSearchPane;
 
+    @SuppressWarnings("unused")
+    @FXML
+    private SplitPane splitPane;
+
     // elements related to the table view of the log entries
     @FXML
     @SuppressWarnings("unused")
@@ -420,6 +426,7 @@ public void search() {
                 },
                 (msg, ex) -> {
                     searchInProgress.set(false);
+                    ExceptionDetailsErrorDialog.openError(splitPane, Messages.SearchFailed, "", ex);
                 });
     }