Merge branch 'master' into CSSTUDIO-1511

Author: georgweiss

.gitignore

@@ -117,4 +117,4 @@ buildNumber.properties
 /.gitignore
 
 # hs_err* files
-**/hs_err*
+**/hs_err*

app/alarm/ui/doc/index.rst

@@ -85,7 +85,7 @@ The UI includes the following applications:
  * Alarm Tree: Primarily used to configure the alarm system,
    i.e. to add PVs and define their alarm details.
 
-   The alarm configuration is hierachical,
+   The alarm configuration is hierarchical,
    starting from for example a top-level `Accelerator`
    configuration to components like `Vacuum`, `RF`,
    with alarm trigger PVs listed below those components.
@@ -94,7 +94,7 @@ The UI includes the following applications:
    `/Accelerator/Vacuum` will see all the guidance and displays
    configured on `Vacuum`.
 
-   The alarm system does not enforce how the hierachical configuration
+   The alarm system does not enforce how the hierarchical configuration
    is used. The 'components' could be subsystems like `Vacuum`, `RF`,
    or they could refer to areas of the machine like `Front End`,
    `Ring`, `Beam Line`. There can be several levels of sub-components,
@@ -124,11 +124,11 @@ The UI includes the following applications:
    Optional component for voice annunciation of new alarms.
 
 Each of the above alarm apps can be launched from the menu.
-They can also be opened from the cmd line as follows::
+They can also be opened from the command line as follows::
 
-    -resource alarm://localhost/Accelerator?app=alarm_tree
-    -resource alarm://localhost/Accelerator?app=alarm_table
-    -resource alarm://localhost/Accelerator?app=alarm_area
+    -resource 'alarm://localhost/Accelerator?app=alarm_tree'
+    -resource 'alarm://localhost/Accelerator?app=alarm_table'
+    -resource 'alarm://localhost/Accelerator?app=alarm_area'
 
 
 Alarm Configuration Options
@@ -177,11 +177,11 @@ Behavior
 
  * Alarm Count:
    Used in combination with the alarm delay.
-   If the trigger PVs exhibits a not-OK alarm severity more more than 'count' times
+   If the trigger PVs exhibits a not-OK alarm severity more than 'count' times
    within the alarm delay, recognize the alarm.
 
    For example, an alarm delay of 10 with an alarm count of 5 means:
-   Recognise an alarm if the PV enters a not-OK severity for more than 10 seconds,
+   Recognize an alarm if the PV enters a not-OK severity for more than 10 seconds,
    or more often than 5 times within 10 seconds.
 
    When the count is zero, only the alarm delay is used.
@@ -198,7 +198,7 @@ When the alarm delay is larger than zero, it starts a timer to check the PV afte
 For example, assume an alarm delay of 10 seconds, and the PV enters a MINOR alarm.
 If the PV still carries a not-OK severity after 10 seconds,
 the alarm state becomes MINOR or whatever the highest alarm severity of the PV was
-in the 10 seconds since first entering a not-OK severty.
+in the 10 seconds since first entering a not-OK severity.
 On the other hand, if the PV recovers to OK, there will be no alarm after the 10 second delay.
 
 As a second example, consider a PV that assumes MINOR severity, then recovers to OK and re-enters MINOR severity a couple of times.
@@ -224,7 +224,7 @@ and is not immediately obvious from the received alarm severity.
 For example, an analog record might enter a MINOR alarm state when its value exceeds the 'HIGH' value.
 Why a certain HIGH threshold was chosen, what the user should do about it, and how the threshold could
 be changed, however, cannot be automatically determined.
-When adding an alarm trigger PV to the alarm system, it is thererfore important to also configure
+When adding an alarm trigger PV to the alarm system, it is therefore important to also configure
 guidance and display links which allow the user to figure out:
 
  * What does this alarm mean? What should I do about it?

app/channel/channelfinder/pom.xml

@@ -42,7 +42,7 @@
     <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>21.0</version>
+        <version>${guava.version}</version>
     </dependency>
   </dependencies>
 </project>

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015-2020 Oak Ridge National Laboratory.
+ * Copyright (c) 2015-2022 Oak Ridge National Laboratory.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import javafx.scene.layout.Pane;
 import org.csstudio.display.builder.model.DirtyFlag;
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
@@ -32,6 +31,7 @@
 import javafx.scene.control.ButtonBase;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.CycleMethod;
 import javafx.scene.paint.LinearGradient;
@@ -268,6 +268,8 @@ private void imagesChanged(final WidgetProperty<?> property, final Object old_va
             loadImage(model_widget.propOffImage().getValue()),
             loadImage(model_widget.propOnImage().getValue())
         };
+        // The 'value_image' needs to be updated
+        stateChanged();
     }
 
     private ImageView loadImage(final String path)

app/logbook/inmemory/pom.xml

@@ -13,9 +13,9 @@
       <version>4.6.6-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>21.0</version>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
     </dependency>
   </dependencies>
 </project>

app/logbook/olog/client-es/pom.xml

@@ -63,11 +63,6 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
         <dependency>
             <groupId>org.phoebus</groupId>
@@ -92,7 +87,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

app/logbook/olog/client/pom.xml

@@ -66,11 +66,6 @@
             <artifactId>javax.activation</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-        </dependency>
     </dependencies>
 
 </project>