Merge remote-tracking branch 'origin/master' into Ticket6240_3He_Fridge_Cryo_Logic

Author: rerpha

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ibex_gui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Jenkinsfile

@@ -14,7 +14,7 @@ pipeline {
   // The options directive is for configuration that applies to the whole job.
   options {
     buildDiscarder(logRotator(numToKeepStr:'10'))
-    timeout(time: 60, unit: 'MINUTES')
+    timeout(time: 120, unit: 'MINUTES')
     disableConcurrentBuilds()
     timestamps()
 	skipDefaultCheckout(true)
@@ -47,22 +47,22 @@ pipeline {
             // env.BRANCH_NAME is only supplied to multi-branch pipeline jobs
             if (env.BRANCH_NAME == null) {
                 env.BRANCH_NAME = ""
-            }
+	    }
+            env.GIT_BRANCH = scm.branches[0].name
             env.GIT_COMMIT = bat(returnStdout: true, script: '@git rev-parse HEAD').trim()
-            env.GIT_BRANCH = bat(returnStdout: true, script: '@git rev-parse --abbrev-ref HEAD').trim()
             echo "git commit: ${env.GIT_COMMIT}"
-            echo "git branch: ${env.BRANCH_NAME} ${env.GIT_BRANCH}"
+            echo "git branch: ${env.BRANCH_NAME} (${env.GIT_BRANCH})"
             if (env.BRANCH_NAME.startsWith("Release")) {
                 env.IS_RELEASE = "YES"
                 env.IS_DEPLOY = "NO"
                 env.IS_E4 = "YES"
             }
-            else if (env.GIT_BRANCH == "origin/master_E3_maint") {
+            else if (env.GIT_BRANCH == "refs/heads/master_E3_maint") {
                 env.IS_RELEASE = "NO"
                 env.IS_DEPLOY = "YES"
                 env.IS_E4 = "NO"
             }
-            else if (env.GIT_BRANCH == "origin/master") {
+            else if (env.GIT_BRANCH == "refs/heads/master") {
                 env.IS_RELEASE = "NO"
                 env.IS_DEPLOY = "YES"
                 env.IS_E4 = "YES"
@@ -111,6 +111,7 @@ pipeline {
 
   post {
     always {
+	    archiveArtifacts artifacts: 'build/*.log', caseSensitive: false
 	    junit '**/surefire-reports/TEST-*.xml,**/test-reports/TEST-*.xml'
     }
   }

base/uk.ac.stfc.isis.ibex.activemq/.classpath

@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"><attributes><attribute name="module" value="true"/></attributes></classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/activemq-all-5.16.0.jar"/>
+	<classpathentry kind="lib" path="lib/activemq-all-5.16.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF

@@ -15,6 +15,6 @@ Require-Bundle: uk.ac.stfc.isis.ibex.logger,
  uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
  org.eclipse.ui.workbench
 Bundle-ClassPath: .,
- lib/activemq-all-5.16.0.jar
+ lib/activemq-all-5.16.2.jar
 Import-Package: org.apache.logging.log4j
 Automatic-Module-Name: uk.ac.stfc.isis.ibex.activemq

base/uk.ac.stfc.isis.ibex.activemq/lib/activemq-all-5.16.0.jar renamed to base/uk.ac.stfc.isis.ibex.activemq/lib/activemq-all-5.16.2.jar

@@ -20,7 +20,7 @@
 package uk.ac.stfc.isis.ibex.banner;
 
 import uk.ac.stfc.isis.ibex.epics.adapters.ModelAdapter;
-import uk.ac.stfc.isis.ibex.epics.writing.SameTypeWriter;
+import uk.ac.stfc.isis.ibex.epics.writing.OnCanWriteChangeListener;
 import uk.ac.stfc.isis.ibex.epics.writing.Writable;
 import uk.ac.stfc.isis.ibex.model.SettableUpdatedValue;
 import uk.ac.stfc.isis.ibex.model.UpdatedValue;
@@ -32,7 +32,8 @@ public class ObservableCustomControl extends ModelAdapter {
 
     private Long valueToWrite;
 
-    private final SameTypeWriter<Long> act = new SameTypeWriter<Long>();
+    private final Writable<Long> act;
+    private final OnCanWriteChangeListener canWriteListener = canWrite -> ObservableCustomControl.this.canWrite.setValue(canWrite);
 
     private SettableUpdatedValue<Boolean> canWrite = new SettableUpdatedValue<Boolean>();
 
@@ -45,13 +46,8 @@ public class ObservableCustomControl extends ModelAdapter {
      *            The value to write to the PV to perform the action
      */
     public ObservableCustomControl(Writable<Long> act, Long valueToWrite) {
-        this.act.subscribe(act);
-        act.subscribe(new SameTypeWriter<Long>() {
-            @Override
-            public void onCanWriteChanged(boolean canwrite) {
-                ObservableCustomControl.this.canWrite.setValue(canwrite);
-            }
-        });
+        this.act = act;
+        act.addOnCanWriteChangeListener(canWriteListener);
         this.valueToWrite = valueToWrite;
     }
 
@@ -76,11 +72,10 @@ public UpdatedValue<Boolean> canWrite() {
     public void setValueToWrite(Long valueToWrite) {
         this.valueToWrite = valueToWrite;
     }
-    
-    /**
-     * @param writable the writable to set
-     */
-    public void setWritable(Writable<Long> writable) {
-        act.subscribe(writable);
+
+    @Override
+    protected void finalize() {
+        act.removeOnCanWriteChangeListener(canWriteListener);
     }
+    
 }

base/uk.ac.stfc.isis.ibex.banner/src/uk/ac/stfc/isis/ibex/banner/ObservableCustomControl.java

@@ -1,20 +1,20 @@
- /*
- * This file is part of the ISIS IBEX application.
- * Copyright (C) 2012-2016 Science & Technology Facilities Council.
- * All rights reserved.
- *
- * This program is distributed in the hope that it will be useful.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution.
- * EXCEPT AS EXPRESSLY SET FORTH IN THE ECLIPSE PUBLIC LICENSE V1.0, THE PROGRAM 
- * AND ACCOMPANYING MATERIALS ARE PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES 
- * OR CONDITIONS OF ANY KIND.  See the Eclipse Public License v1.0 for more details.
- *
- * You should have received a copy of the Eclipse Public License v1.0
- * along with this program; if not, you can obtain a copy from
- * https://www.eclipse.org/org/documents/epl-v10.php or 
- * http://opensource.org/licenses/eclipse-1.0.php
- */
+/*
+* This file is part of the ISIS IBEX application.
+* Copyright (C) 2012-2016 Science & Technology Facilities Council.
+* All rights reserved.
+*
+* This program is distributed in the hope that it will be useful.
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License v1.0 which accompanies this distribution.
+* EXCEPT AS EXPRESSLY SET FORTH IN THE ECLIPSE PUBLIC LICENSE V1.0, THE PROGRAM 
+* AND ACCOMPANYING MATERIALS ARE PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES 
+* OR CONDITIONS OF ANY KIND.  See the Eclipse Public License v1.0 for more details.
+*
+* You should have received a copy of the Eclipse Public License v1.0
+* along with this program; if not, you can obtain a copy from
+* https://www.eclipse.org/org/documents/epl-v10.php or 
+* http://opensource.org/licenses/eclipse-1.0.php
+*/
 
 /**
  * 
@@ -28,79 +28,85 @@
 import uk.ac.stfc.isis.ibex.instrument.channels.EnumChannel;
 import uk.ac.stfc.isis.ibex.instrument.channels.NumberChannel;
 import uk.ac.stfc.isis.ibex.instrument.channels.NumberWithPrecisionChannel;
-import uk.ac.stfc.isis.ibex.model.UpdatedValue;
 
 /**
  * The observables for a generic ISIS end station.
  */
 public abstract class EndStationObservables extends Observables {
-    private final UpdatedValue<String> beam;
-    private final UpdatedValue<String> pps;
-    private final UpdatedValue<String> beamCurrent;
-    private final UpdatedValue<String> uAHToday;
-    private final UpdatedValue<String> lastBeamOff;
-    private final UpdatedValue<String> lastBeamOn;
-
-    /**
-     * Constructor to register the observables for an ISIS end station.
-     * 
-     * @param prefix
-     *            The prefix for that specific station.
-     */
-    protected EndStationObservables(PVAddress prefix) {
-
-        beam = adaptEnum(
-                obsFactory.getSwitchableObservable(new EnumChannel<OnOff>(OnOff.class), prefix.endWith("BEAM:STAT")));
-        pps = adaptNumber(obsFactory.getSwitchableObservable(new NumberChannel(), prefix.endWith(FREQ)));
-        beamCurrent = adaptNumber(
-                obsFactory.getSwitchableObservable(new NumberWithPrecisionChannel(), prefix.endWith(BEAM_CURRENT)));
-        uAHToday = adaptNumber(
-                obsFactory.getSwitchableObservable(new NumberWithPrecisionChannel(), prefix.endWith("BEAM:TOTAL")));
-        lastBeamOff = adapt(obsFactory.getSwitchableObservable(new DateTimeChannel(), prefix.endWith("BEAMOFF:TIME")));
-        lastBeamOn = adapt(obsFactory.getSwitchableObservable(new DateTimeChannel(), prefix.endWith("BEAMON:TIME")));
-    }
-
-    /**
-     * @return The updated value for the end station beam status.
-     */
-    public UpdatedValue<String> beam() {
-        return beam;
-    }
-
-    /**
-     * @return The updated value for the end station beam frequency.
-     */
-    public UpdatedValue<String> pps() {
-        return pps;
-    }
-
-    /**
-     * @return The updated value for the end station beam current.
-     */
-    public UpdatedValue<String> beamCurrent() {
-        return beamCurrent;
-    }
-
-    /**
-     * @return The updated value for the total current today at the end station.
-     */
-    public UpdatedValue<String> uAHToday() {
-        return uAHToday;
-    }
-
-    /**
-     * @return The updated value for the last time the beam was off for the end
-     *         station.
-     */
-    public UpdatedValue<String> lastBeamOff() {
-        return lastBeamOff;
-    }
-
-    /**
-     * @return The updated value for the last time the beam was on for the end
-     *         station.
-     */
-    public UpdatedValue<String> lastBeamOn() {
-        return lastBeamOn;
-    }
+	private final FacilityPV beam;
+	private final FacilityPV pps;
+	private final FacilityPV beamCurrent;
+	private final FacilityPV uAHToday;
+	private final FacilityPV lastBeamOff;
+	private final FacilityPV lastBeamOn;
+
+	/**
+	 * Constructor to register the observables for an ISIS end station.
+	 * 
+	 * @param prefix The prefix for that specific station.
+	 */
+	protected EndStationObservables(PVAddress prefix) {
+
+		beam = new FacilityPV(prefix.endWith("BEAM:STAT"), adaptEnum(
+				obsFactory.getSwitchableObservable(new EnumChannel<OnOff>(OnOff.class), prefix.endWith("BEAM:STAT"))));
+
+		pps = new FacilityPV(prefix.endWith(FREQ),
+				adaptNumber(obsFactory.getSwitchableObservable(new NumberChannel(), prefix.endWith(FREQ))));
+
+		beamCurrent = new FacilityPV(prefix.endWith(BEAM_CURRENT), adaptNumber(
+				obsFactory.getSwitchableObservable(new NumberWithPrecisionChannel(), prefix.endWith(BEAM_CURRENT))));
+
+		uAHToday = new FacilityPV(prefix.endWith("BEAM:TOTAL"), adaptNumber(
+				obsFactory.getSwitchableObservable(new NumberWithPrecisionChannel(), prefix.endWith("BEAM:TOTAL"))));
+
+		lastBeamOff = new FacilityPV(prefix.endWith("BEAMOFF:TIME"),
+				adapt(obsFactory.getSwitchableObservable(new DateTimeChannel(), prefix.endWith("BEAMOFF:TIME"))));
+
+		lastBeamOn = new FacilityPV(prefix.endWith("BEAMON:TIME"),
+				adapt(obsFactory.getSwitchableObservable(new DateTimeChannel(), prefix.endWith("BEAMON:TIME"))));
+	}
+
+	/**
+	 * @return The updated value for the end station beam status.
+	 */
+	public FacilityPV beam() {
+		return beam;
+	}
+
+	/**
+	 * @return The updated value for the end station beam frequency.
+	 */
+	public FacilityPV pps() {
+		return pps;
+	}
+
+	/**
+	 * @return The updated value for the end station beam current.
+	 */
+	public FacilityPV beamCurrent() {
+		return beamCurrent;
+	}
+
+	/**
+	 * @return The updated value for the total current today at the end station.
+	 */
+	public FacilityPV uAHToday() {
+		return uAHToday;
+	}
+
+	/**
+	 * @return The updated value for the last time the beam was off for the end
+	 *         station.
+	 */
+	public FacilityPV lastBeamOff() {
+		return lastBeamOff;
+	}
+
+	/**
+	 * @return The updated value for the last time the beam was on for the end
+	 *         station.
+	 */
+	public FacilityPV lastBeamOn() {
+		return lastBeamOn;
+	}
 }

base/uk.ac.stfc.isis.ibex.beamstatus/src/uk/ac/stfc/isis/ibex/beamstatus/EndStationObservables.java

@@ -0,0 +1,33 @@
+package uk.ac.stfc.isis.ibex.beamstatus;
+
+import uk.ac.stfc.isis.ibex.model.UpdatedValue;
+
+/**
+ * A class to create facility PV objects.
+ *
+ */
+public class FacilityPV {
+
+	/**
+	 * The source PV address.
+	 */
+	public String pv;
+	
+	/**
+	 * The object holding the latest PV value.
+	 */
+	public UpdatedValue<String> updatedValue;
+
+	/**
+	 * Constructor for creating a facility PV.
+	 * 
+	 * @param pv           Pv address
+	 * @param updatedValue Value of the pv
+	 */
+	public FacilityPV(String pv, UpdatedValue<String> updatedValue) {
+		this.pv = pv;
+		this.updatedValue = updatedValue;
+
+	}
+
+}