Commit ad71a5d6 authored by Gino Tosti's avatar Gino Tosti
Browse files

minor changes

parent 67f6d3cc

src/astri/tcs/TCSHardwareDeviceImpl/TCSHardwareDeviceImpl.java

+13 −2
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ import alma.TMCDB.MonitorCollector; 
import alma.TMCDB.MonitorCollectorHelper;

import alma.TMCDB.MonitorCollectorHelper;

import alma.acs.component.ComponentLifecycleException;

import alma.acs.component.ComponentLifecycleException;

import alma.acs.container.ContainerServices;

import alma.acs.container.ContainerServices;

import alma.acs.logging.AcsLogLevel;

import alma.maciErrType.wrappers.AcsJComponentCleanUpEx;

import alma.maciErrType.wrappers.AcsJComponentCleanUpEx;

import astri.tcs.TCSHardwareDeviceOperations;

import astri.tcs.TCSHardwareDeviceOperations;

import astri.tcs.TCSControlDeviceImpl.TCSControlDeviceImpl;

import astri.tcs.TCSControlDeviceImpl.TCSControlDeviceImpl;
@@ -70,7 +71,6 @@ public class TCSHardwareDeviceImpl extends TCSControlDeviceImpl implements 




	public void cleanUp() throws AcsJComponentCleanUpEx{

	public void cleanUp() throws AcsJComponentCleanUpEx{

			tcshwStop();

			tcshwStop();

		

			super.cleanUp();

			super.cleanUp();

		

		

	}

	}
@@ -123,7 +123,8 @@ public class TCSHardwareDeviceImpl extends TCSControlDeviceImpl implements 
		}

		}

		

		

		try {

		try {

			monitorCollector_m.registerNonCollocatedMonitoredDevice(cmpName, serialNumber);

			//monitorCollector_m.registerCollocatedMonitoredDevice(cmpName, serialNumber);

			monitorCollector_m.registerMonitoredDevice(cmpName, serialNumber);

		} catch (RegisteringDeviceProblemEx e) {

		} catch (RegisteringDeviceProblemEx e) {

			// TODO Auto-generated catch block

			// TODO Auto-generated catch block

			monitorCollector_m=null;

			monitorCollector_m=null;
@@ -254,6 +255,16 @@ public class TCSHardwareDeviceImpl extends TCSControlDeviceImpl implements 
		// TODO Auto-generated method stub

		// TODO Auto-generated method stub

		String cmpName=this.name();

		String cmpName=this.name();

		deviceState=tcshwState.STOP;

		deviceState=tcshwState.STOP;

		if (isMonitoring()) {

			monitoringOff();

			try {

				deregisterWithCollector();

			} catch (AcsJContainerServicesEx e) {

				// TODO Auto-generated catch block

				m_logger.log(AcsLogLevel.SEVERE,"problems dereistering with collector",e.getMessage());

			}

			

		}

		m_logger.info("STOPPED component: "+cmpName);

		m_logger.info("STOPPED component: "+cmpName);

	}

	}