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

Author: Tom-Willemsen

base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/configuration/BannerItem.java

@@ -1,12 +1,15 @@
 package uk.ac.stfc.isis.ibex.configserver.configuration;
 
 
+import uk.ac.stfc.isis.ibex.configserver.AlarmState;
 import uk.ac.stfc.isis.ibex.epics.observing.BaseObserver;
 import uk.ac.stfc.isis.ibex.epics.observing.ForwardingObservable;
 import uk.ac.stfc.isis.ibex.epics.switching.ObservableFactory;
 import uk.ac.stfc.isis.ibex.epics.switching.OnInstrumentSwitch;
 import uk.ac.stfc.isis.ibex.instrument.InstrumentUtils;
-import uk.ac.stfc.isis.ibex.instrument.channels.BooleanChannel;
+import uk.ac.stfc.isis.ibex.instrument.channels.DefaultChannel;
+import uk.ac.stfc.isis.ibex.instrument.channels.EnumChannel;
+import uk.ac.stfc.isis.ibex.logger.IsisLog;
 import uk.ac.stfc.isis.ibex.model.ModelObject;
 
 /**
@@ -19,79 +22,115 @@ public class BannerItem extends ModelObject {
 
     private String name;
     private String pv;
-    private String type;
-	private BannerItemState true_state;
-	private BannerItemState false_state;
-	private BannerItemState unknown_state;
-	private BannerItemState currentState;
+    private Boolean local = true;
+    
+    private String currentValue = null;
+    private AlarmState currentAlarmState = AlarmState.UNDEFINED;
 
-    private ObservableFactory obsFactory = null;
-	private ForwardingObservable<Boolean> pvObservable;
+    private static final ObservableFactory OBSERVABLE_FACTORY = new ObservableFactory(OnInstrumentSwitch.CLOSE);
+	private ForwardingObservable<String> pvObservable;
+	private ForwardingObservable<AlarmState> alarmObservable;
 
     /**
      * Creates an observable for the PV holding the current state of this banner
      * item.
      */
 	public void createPVObservable() {
-        obsFactory = new ObservableFactory(OnInstrumentSwitch.CLOSE);
-
-        pvObservable = obsFactory.getSwitchableObservable(new BooleanChannel(),
-                InstrumentUtils.addPrefix(this.pv));
-        pvObservable.addObserver(stateAdapter);
+		String pv = this.pv;
+		if (local) {
+			pv = InstrumentUtils.addPrefix(pv);
+		}
+		
+        pvObservable = OBSERVABLE_FACTORY.getSwitchableObservable(new DefaultChannel(), pv);
+        alarmObservable = OBSERVABLE_FACTORY.getSwitchableObservable(new EnumChannel<>(AlarmState.class), pv + ".SEVR");
+        pvObservable.addObserver(valueAdapter);
+        alarmObservable.addObserver(alarmAdapter);
 	}
 
-    private final BaseObserver<Boolean> stateAdapter = new BaseObserver<Boolean>() {
+    private final BaseObserver<String> valueAdapter = new BaseObserver<String>() {
+
+        @Override
+        public void onValue(String value) {
+            setCurrentValue(value);
+        }
+
+        @Override
+        public void onError(Exception e) {
+            setCurrentValue(null);
+            IsisLog.getLogger(getClass()).error("Exception in banner item state adapter: " + e.getMessage());
+        }
+
+        @Override
+        public void onConnectionStatus(boolean isConnected) {
+            if (!isConnected) {
+                setCurrentValue(null);
+            }
+        }
+    };
+    
+    private final BaseObserver<AlarmState> alarmAdapter = new BaseObserver<AlarmState>() {
 
         @Override
-        public void onValue(Boolean value) {
-            setCurrentState(value);
+        public void onValue(AlarmState alarm) {
+            setCurrentAlarm(alarm);
         }
 
         @Override
         public void onError(Exception e) {
-            setCurrentState(null);
+            setCurrentAlarm(AlarmState.INVALID);
+            IsisLog.getLogger(getClass()).error("Exception in banner item state adapter: " + e.getMessage());
         }
 
         @Override
         public void onConnectionStatus(boolean isConnected) {
             if (!isConnected) {
-                setCurrentState(null);
+                setCurrentAlarm(AlarmState.INVALID);
             }
         }
     };
 
+    /**
+     * Returns the display name of this banner item.
+     * @return the display name of this banner item.
+     */
     public String name() {
-        return this.name;
+        return name;
+    }
+    
+    /**
+     * Returns the current value of this banner item.
+     * @return the current value of this banner item.
+     */
+    public String value() {
+    	return currentValue;
+    }
+    
+    /**
+     * Returns the alarm status of this banner item.
+     * @return the alarm status of this banner item.
+     */
+    public AlarmState alarm() {
+    	return currentAlarmState;
     }
 
     /**
-     * Returns the display specification for the banner item in its current
-     * state.
+     * Sets the current state of the property based on the PV value and fires a
+     * property change for listeners.
      * 
-     * @return the current state
+     * @param value the state value of the property.
      */
-    public BannerItemState getCurrentState() {
-		return currentState;
+    public synchronized void setCurrentValue(String value) {
+        firePropertyChange("value", this.currentValue, this.currentValue = value);
 	}
-
+    
     /**
      * Sets the current state of the property based on the PV value and fires a
      * property change for listeners.
      * 
      * @param value the state value of the property.
      */
-    public void setCurrentState(Boolean value) {
-        BannerItemState newState;
-        if (value == null) {
-            newState = this.unknown_state;
-        } else {
-            if (value) {
-                newState = this.true_state;
-            } else {
-                newState = this.false_state;
-            }
-        }
-        firePropertyChange("currentState", this.currentState, this.currentState = newState);
+    public synchronized void setCurrentAlarm(AlarmState alarm) {
+        firePropertyChange("alarm", this.currentAlarmState, this.currentAlarmState = alarm);
 	}
 
 }