tango command and attribute implement the PVFactory interface respectively.

Author: alonelytree

core/pv/doc/index.rst

@@ -161,5 +161,6 @@ Currently, all types of scalars are supported, but SPECTRUM and IMAGE are not ye
 
 Examples ::
 
-    tango://att:/devicename/attributename
-    tango://com:/devicename/comandname
+    tga://device/attribute
+    tgc://device/command
+

core/pv/pom.xml

@@ -71,11 +71,23 @@
         <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         <version>1.2.2</version>
     </dependency>
-    
     <dependency>
       <groupId>org.tango-controls</groupId>
-      <artifactId>JTango</artifactId>
+      <artifactId>JTangoCommons</artifactId>
+      <version>9.7.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.tango-controls</groupId>
+      <artifactId>JTangoClientLang</artifactId>
+      <version>9.6.8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.tango-controls</groupId>
+      <artifactId>JTangoServer</artifactId>
       <version>9.6.8</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>

…a/org/phoebus/pv/tango/TangoContext.java …org/phoebus/pv/tga/TangoAttrContext.javacore/pv/src/main/java/org/phoebus/pv/tango/TangoContext.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoAttrContext.java core/pv/src/main/java/org/phoebus/pv/tango/TangoContext.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoAttrContext.java

@@ -1,44 +1,41 @@
-package org.phoebus.pv.tango;
+package org.phoebus.pv.tga;
 
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.Tango.EventProperties;
 import fr.esrf.TangoApi.AttributeInfoEx;
 import fr.esrf.TangoApi.AttributeProxy;
 import fr.esrf.TangoApi.DeviceAttribute;
-import fr.soleil.tango.clientapi.TangoCommand;
 import org.epics.vtype.*;
 import org.phoebus.pv.PV;
 import org.tango.attribute.AttributeTangoType;
-import org.tango.command.CommandTangoType;
 import org.tango.server.events.EventType;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 ;
 
-public class TangoContext {
-    private static TangoContext instance;
+public class TangoAttrContext {
+    private static TangoAttrContext instance;
     private final ConcurrentHashMap<String, AttributeProxy> attributeProxys;
     private final ConcurrentHashMap<String, Integer> events;
     private final ConcurrentHashMap<String, AttributeTangoType> types;
-    private final ConcurrentHashMap<String, TangoCommand> commands;
 
 
-    private TangoContext() {
+
+    private TangoAttrContext() {
         events = new ConcurrentHashMap<>();
         attributeProxys = new ConcurrentHashMap<>();
         types = new ConcurrentHashMap<>();
-        commands = new ConcurrentHashMap<>();
     }
 
-    public static synchronized TangoContext getInstance() throws Exception {
+    public static synchronized TangoAttrContext getInstance() throws Exception {
         if (instance == null)
-            instance = new TangoContext();
+            instance = new TangoAttrContext();
         return instance;
     }
 
-    public void subscribeAttributeEvent(String deviceName, String attributeName, String baseName, Tango_PV pv) throws DevFailed {
+    public void subscribeAttributeEvent(String deviceName, String attributeName, String baseName, TangoAttr_PV pv) throws DevFailed {
         String name = deviceName +"/" + attributeName;
         AttributeProxy attributeProxy;
         if (attributeProxys.get(baseName) == null) {
@@ -48,11 +45,10 @@ public void subscribeAttributeEvent(String deviceName, String attributeName, Str
         }else {
             //nothing to do
         }
-    }
 
-    private void subscribeAttributeEvent(String baseName, AttributeProxy attributeProxy, Tango_PV pv) throws DevFailed {
-        System.out.println("subscribe tango attribute : " + baseName);
+    }
 
+    private void subscribeAttributeEvent(String baseName, AttributeProxy attributeProxy, TangoAttr_PV pv) throws DevFailed {
         AttributeInfoEx attribute_info_ex;
         try {
             attribute_info_ex = attributeProxy.get_info_ex();
@@ -111,7 +107,6 @@ public void writeAttribute(String baseName, String attributeName, Object new_val
             PV.logger.log(Level.WARNING, "Could not find type of attribute :" + baseName);
             throw new Exception("Tango attribute write failed: attribute type not found.");
         }
-        System.out.println("Tango attribute write: attribute:"+ attributeName + " value:" + new_value);
         VType vType;
         String value;
         switch (type){
@@ -164,83 +159,4 @@ public void writeAttribute(String baseName, String attributeName, Object new_val
 
     }
 
-
-    public void createTangoCommand(String deviceName, String commandName, String baseName, Tango_PV pv) throws DevFailed {
-        TangoCommand tangoCommand = commands.get(baseName);
-        if ( tangoCommand == null ){
-            tangoCommand = new TangoCommand(deviceName, commandName);
-            commands.put(baseName, tangoCommand);
-        }
-        pv.StartCommand(tangoCommand.getCommandName());
-    }
-
-    public void removeTangoCommand(String baseName) throws Exception {
-        TangoCommand tangoCommand = commands.get(baseName);
-        if (tangoCommand == null){
-            PV.logger.log(Level.WARNING, "Could not remove Tango command \"" + baseName
-                    + "\" due to no internal record of command");
-            throw new Exception("Tango command remove failed: no command record.");
-        }
-        commands.remove(baseName, tangoCommand);
-    }
-
-    public void executeTangoCommand(String baseName, Object new_value, Tango_PV pv) throws Exception {
-        TangoCommand tangoCommand = commands.get(baseName);
-        if (tangoCommand == null){
-            PV.logger.log(Level.WARNING, "Could not find Tango command \"" + baseName
-                    + "\" due to no internal record of command");
-            throw new Exception("Tango command execute failed: no command record.");
-        }
-
-        CommandTangoType typeFromTango = CommandTangoType.getTypeFromTango(tangoCommand.getArginType());
-        Object res;
-        VType value;
-        switch (typeFromTango){
-            case DEVBOOLEAN:
-                res = tangoCommand.execute(Boolean.class, new_value);
-                value = TangoTypeUtil.convert(res, VBoolean.class);
-                pv.endCommand(value);
-                break;
-            case DEVSHORT:
-                res = tangoCommand.execute(Short.class, new_value);
-                value = TangoTypeUtil.convert(res, VShort.class);
-                pv.endCommand(value);
-                break;
-            case DEVLONG64:
-                res = tangoCommand.execute(Long.class, new_value);
-                value = TangoTypeUtil.convert(res, VLong.class);
-                pv.endCommand(value);
-                break;
-            case DEVFLOAT:
-                res = tangoCommand.execute(Float.class, new_value);
-                value = TangoTypeUtil.convert(res, VFloat.class);
-                pv.endCommand(value);
-                break;
-            case DEVDOUBLE:
-                res = tangoCommand.execute(Double.class,new_value);
-                value = TangoTypeUtil.convert(res, VDouble.class);
-                pv.endCommand(value);
-                break;
-            case DEVSTRING:
-                res = tangoCommand.execute(String.class,new_value);
-                value = TangoTypeUtil.convert(res, VString.class);
-                pv.endCommand(value);
-                break;
-            case DEVLONG:
-                res = tangoCommand.execute(Integer.class,new_value);
-                value = TangoTypeUtil.convert(res, VInt.class);
-                pv.endCommand(value);
-                break;
-            case DEVUCHAR:
-                res = tangoCommand.execute(Byte.class,new_value);
-                value = TangoTypeUtil.convert(res, VByte.class);
-                pv.endCommand(value);
-                break;
-            default:
-                throw new IllegalArgumentException("Value " + new_value + " cannot be converted.");
-        }
-
-
-
-    }
 }

…/java/org/phoebus/pv/tango/Tango_PV.java …ava/org/phoebus/pv/tga/TangoAttr_PV.javacore/pv/src/main/java/org/phoebus/pv/tango/Tango_PV.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoAttr_PV.java core/pv/src/main/java/org/phoebus/pv/tango/Tango_PV.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoAttr_PV.java

@@ -1,4 +1,4 @@
-package org.phoebus.pv.tango;
+package org.phoebus.pv.tga;
 
 import fr.esrf.Tango.DevFailed;
 import fr.esrf.TangoApi.CallBack;
@@ -11,96 +11,53 @@
 import java.time.Instant;
 import java.util.logging.Level;
 
-
-public class Tango_PV extends PV {
+public class TangoAttr_PV extends PV {
 
     private final String baseName;
-    private  String deviceName;
-    private String variableType;
-    private  String memberVariable;
+    private  String device;
+    private String attribute;
+
 
-    public Tango_PV(String name, String baseName) throws Exception {
+    public TangoAttr_PV(String name, String baseName) throws Exception {
         super(name);
         this.baseName = baseName;
         parseRawName(baseName);
-        if ("att".equals(variableType)){
-            TangoContext.getInstance().subscribeAttributeEvent(deviceName, memberVariable, baseName,this);
-        }else if ("com".equals(variableType)){
-            TangoContext.getInstance().createTangoCommand(deviceName, memberVariable, baseName, this);
-        }
+        TangoAttrContext.getInstance().subscribeAttributeEvent(device, attribute, baseName,this);
     }
 
-    /** Handles these types of tango names:
-     *  <pre>
-     *      att:/device_name/attribute_name --> att && device_name && attribute_name
-     *      com:/device_name/command_name --> com && device_name && command_name
-     *  </pre>
-     */
-    private void parseRawName(final String name) throws Exception {
-        //String variableType, deviceName, memberVariable;
-        String[] str= name.split(":/");
-
-        if (name.length() <= 4 && str.length > 2)
-            throw new Exception("Invalid input:" + name);
 
-        //Locate tango attribute or command
-        variableType = str[0];
-        String prefix = str[1];
-
-       int pos = prefix.lastIndexOf('/');
-       if (pos <= 0)
-           throw new Exception("Invalid input：" + name);
+    private void parseRawName(final String name) throws Exception {
+        int pos = name.lastIndexOf('/');
+        if (pos <= 0)
+            throw new Exception("Invalid input：" + name);
         //Locate device name
-        deviceName = prefix.substring(0,pos);
-
-        //Locate tango attribute or command name
-        memberVariable = prefix.substring(pos+1);
+        device = name.substring(0,pos);
+        //Locate tango attribute
+        attribute = name.substring(pos+1);
     }
 
-    /**
-     * attributes and commands need to be closed separately.
-     */
+
     @Override
     protected void close()
     {
         try
         {
-            if ("att".equals(variableType)){
-                TangoContext.getInstance().unSubscribeAttributeEvent(baseName);
-            }else if ("com".equals(variableType)){
-                TangoContext.getInstance().removeTangoCommand(baseName);
-            }
-
+            TangoAttrContext.getInstance().unSubscribeAttributeEvent(baseName);
         }
         catch (Exception ex)
         {
-            logger.log(Level.WARNING, "Failed to unsubscribe Tango Attribute/Command from base name " + baseName);
+            logger.log(Level.WARNING, "Failed to unsubscribe Tango Attribute from base name " + baseName);
             ex.printStackTrace();
         }
     }
 
-
     @Override
     public void write(final Object new_value) throws Exception{
         if (new_value == null)
             throw new Exception(getName() + " got null");
-        if ("att".equals(variableType)){
-            TangoContext.getInstance().writeAttribute(baseName, memberVariable, new_value);
-        }else if ("com".equals(variableType)){
-            TangoContext.getInstance().executeTangoCommand(baseName, new_value, this);
-        }
+        TangoAttrContext.getInstance().writeAttribute(baseName, attribute, new_value);
     }
 
-    public void StartCommand(final String commandName) {
-        notifyListenersOfValue(VType.toVType(commandName));
-    }
-
-    /**
-    Return the result after the command is executed。
-     */
-    public void endCommand(final VType value) {
-        notifyListenersOfValue(value);
-    }
 
     class TangoCallBack extends CallBack {
         private final AttributeTangoType type;
@@ -169,4 +126,3 @@ public void push_event(EventData evt) {
         }
     }
 }
-

core/pv/src/main/java/org/phoebus/pv/tga/TangoAttr_PVFactory.java

@@ -0,0 +1,23 @@
+package org.phoebus.pv.tga;
+
+import org.phoebus.pv.PV;
+import org.phoebus.pv.PVFactory;
+
+
+public class TangoAttr_PVFactory implements PVFactory {
+
+    /** PV type implemented by this factory */
+    final public static String TYPE = "tga";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    @Override
+    public PV createPV(String name, String base_name) throws Exception {
+        return new TangoAttr_PV(name, base_name);
+    }
+
+
+}

…/org/phoebus/pv/tango/TangoTypeUtil.java …va/org/phoebus/pv/tga/TangoTypeUtil.javacore/pv/src/main/java/org/phoebus/pv/tango/TangoTypeUtil.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoTypeUtil.java core/pv/src/main/java/org/phoebus/pv/tango/TangoTypeUtil.java renamed to core/pv/src/main/java/org/phoebus/pv/tga/TangoTypeUtil.java

@@ -1,4 +1,4 @@
-package org.phoebus.pv.tango;
+package org.phoebus.pv.tga;
 
 
 import org.epics.vtype.*;