Test of Node.

Author: ceos01

plc4j/tools/app/app-libs/pom.xml

@@ -35,6 +35,7 @@
                     <configuration>
                         <publicPackages> 
                             <package>org.apache.plc4x.java.api.*</package>  
+                            <package>org.openide.util.lookup.*</package>
                         </publicPackages>
                     </configuration>                
             </plugin>
@@ -270,5 +271,10 @@
             <artifactId>org-openide-nodes</artifactId>
             <version>RELEASE160</version>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-util-lookup</artifactId>
+            <version>RELEASE160</version>
+        </dependency>
     </dependencies>
 </project>

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/DeviceDBRecord.java renamed to plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/DeviceRecord.java

@@ -18,14 +18,17 @@
  */
 package org.apache.plc4x.app.api;
 
+import java.beans.PropertyChangeListener;
 import java.time.Instant;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
+import org.openide.util.Lookup;
 
 
-public interface DeviceDBRecord {
+public interface DeviceRecord extends Lookup.Provider {
 
     public void setDeviceName(String name);  
     String getDeviceName();
@@ -49,8 +52,17 @@ public interface DeviceDBRecord {
     public String getPropertie(String id);
     public Map<String, String> getProperties();
 
-    public Collection<TagGroupDBRecord> getTagGroups();    
+    public void addTagGroup(TagGroupRecord  tagg);
+    public Collection<TagGroupRecord> getTagGroups();
+    public Optional<TagGroupRecord> getTagGroup(TagGroupRecord tagg);    
+    public Optional<TagGroupRecord> getTagGroup(UUID uuid);
+    public Optional<TagGroupRecord> getTagGroup(String name);    
+    public void removeTagGroup(TagGroupRecord  device);    
 
+    
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+    public void removePropertyChangeListener(PropertyChangeListener listener);    
+        
     public int getTransmits();
     public int getReceives();
     public int getErrors();

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/DriverDBRecord.java renamed to plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/DriverRecord.java

@@ -18,16 +18,19 @@
  */
 package org.apache.plc4x.app.api;
 
+import java.beans.PropertyChangeListener;
 import java.time.Instant;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import org.apache.plc4x.java.api.PlcDriver;
+import org.openide.util.Lookup;
 
 
-public interface DriverDBRecord {
+public interface DriverRecord extends Lookup.Provider {
 
     // Configuration section
 
@@ -43,10 +46,20 @@ public interface DriverDBRecord {
     public PlcDriver getPlcDriver();
 
     public void setEnable(Boolean enable);
-    public Boolean getEnable();  
+    public Boolean getEnable(); 
 
-    public HashMap<UUID, DeviceDBRecord> getMapDevices();
-    public Collection<DeviceDBRecord> getDevices();
+    public void addDevice(DeviceRecord  device);
+    public Collection<DeviceRecord> getDevices();
+    public Optional<DeviceRecord> getDevice(DeviceRecord uuid);    
+    public Optional<DeviceRecord> getDevice(UUID uuid);
+    public Optional<DeviceRecord> getDevice(String name);    
+    public void removeDevice(DeviceRecord  device);
+
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+    public void removePropertyChangeListener(PropertyChangeListener listener);    
+    
+    public HashMap<UUID, DeviceRecord> getMapDevices();
+
 
     public int getTransmits();
     public int getReceives();

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/MasterDB.java

@@ -18,18 +18,42 @@
  */
 package org.apache.plc4x.app.api;
 
+import java.beans.PropertyChangeListener;
 import java.util.List;
-import org.apache.plc4x.java.api.PlcDriver;
+import java.util.Optional;
+import java.util.UUID;
 
 
 public interface MasterDB {
+
+    public void addDriver(DriverRecord driver);
+    public Optional<DriverRecord> getDriver(UUID uuid);    
+    public void removeDriver(UUID uuid);
 
-    public List<String> getDriverCodes();    
-    public List<String> getDriverNames();
+    public void addDevice(UUID driver, DeviceRecord device);
+    public Optional<DeviceRecord> getDevice(UUID uuid);      
+    public void removeDevice(DeviceRecord device);  
+    
+    public void addTagGroup(UUID device, TagGroupRecord taggroup);
+    public Optional<TagGroupRecord>  getTagGroup(UUID uuid);     
+    public void removeTagGroup(TagGroupRecord taggroup);      
+    
+    public void addTag(UUID taggroup, TagRecord tag);
+    public Optional<TagRecord> getTag(UUID uuid);      
+    public void removeTag(UUID uuid);     
 
-    public DriverDBRecord getDriverByCode(String code);
-    public DriverDBRecord getDriverByName(String name);    
+    public DriverRecord getDriverByCode(String code);
+    public DriverRecord getDriverByName(String name);  
 
+    public DeviceRecord createDeviceDBRecord();
+    public TagGroupRecord createTagGroupDBRecord();    
+    public TagRecord createTagDBRecord(); 
+    
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+    public void removePropertyChangeListener(PropertyChangeListener listener);
+    
+    public List<String> getDriverCodes();    
+    public List<String> getDriverNames();    
 
     public int getNumberOfDrivers();
     public int getNumberOfDevice();

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/Plc4xDialogParametersEnum.java renamed to plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/Plc4xPropertyEnum.java

@@ -19,7 +19,14 @@
 package org.apache.plc4x.app.api;
 
 
-public enum Plc4xDialogParametersEnum {
+public enum Plc4xPropertyEnum {
+    
+    //Commons fields in dialogs
+    NAME,
+    DESCRIPTION,
+    SCANTIME,
+    ENABLE,
+    DISABLE_OUTPUT,
 
     //Serial connection parameters
     SERIAL_PORT,

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/TagGroupDBRecord.java renamed to plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/TagGroupRecord.java

@@ -18,12 +18,15 @@
  */
 package org.apache.plc4x.app.api;
 
+import java.beans.PropertyChangeListener;
 import java.time.Instant;
 import java.util.Collection;
+import java.util.Optional;
 import java.util.UUID;
+import org.openide.util.Lookup;
 
 
-public interface TagGroupDBRecord {
+public interface TagGroupRecord  extends Lookup.Provider {
 
 
     public void setTagGroupName(String name);  
@@ -41,8 +44,16 @@ public interface TagGroupDBRecord {
     public void setEnable(Boolean enable);
     public Boolean getEnable(); 
 
-    public Collection<TagDBRecord> getTags();     
+    public void addTag(TagRecord  tag);
+    public Collection<TagRecord> getTags();
+    public Optional<TagRecord> getTag(TagRecord tag);    
+    public Optional<TagRecord> getTag(UUID uuid);
+    public Optional<TagRecord> getTag(String name);    
+    public void removeTag(TagRecord  tag); 
 
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+    public void removePropertyChangeListener(PropertyChangeListener listener);    
+          
     public int getJitter();
 
     public int getTransmits();

plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/TagDBRecord.java renamed to plc4j/tools/app/app-libs/src/main/java/org/apache/plc4x/app/api/TagRecord.java

@@ -18,11 +18,12 @@
  */
 package org.apache.plc4x.app.api;
 
+import java.beans.PropertyChangeListener;
 import java.time.Instant;
 import java.util.UUID;
 
 
-public interface TagDBRecord {
+public interface TagRecord {
 
     public void setTagName(String name);  
     String getTagName();
@@ -42,6 +43,9 @@ public interface TagDBRecord {
     public void setDisableOutput(Boolean disableOutput);
     public Boolean getDisableOutput();     
 
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+    public void removePropertyChangeListener(PropertyChangeListener listener);    
+    
     public int getTransmits();
     public int getReceives();
     public int getErrors();

plc4j/tools/app/app-modbus/src/main/java/org/apache/plc4x/app/modbus/core/Plc4xModbusAsciiDialog.java

@@ -21,26 +21,30 @@
 import java.io.IOException;
 import java.util.UUID;
 import javax.swing.JDialog;
-import org.apache.plc4x.app.api.DeviceDBRecord;
-import org.apache.plc4x.app.api.DriverDBRecord;
+import org.apache.plc4x.app.api.MasterDB;
 import org.apache.plc4x.app.api.Plc4xDialog;
-import org.apache.plc4x.app.api.Plc4xDialogParametersEnum;
+import org.apache.plc4x.app.api.Plc4xPropertyEnum;
 import org.openide.cookies.InstanceCookie;
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.BeanNode;
 import org.openide.nodes.Node;
 import org.openide.util.Exceptions;
+import org.openide.util.Lookup;
 import org.openide.util.lookup.ServiceProvider;
+import org.apache.plc4x.app.api.DeviceRecord;
+import org.apache.plc4x.app.api.DriverRecord;
 
-@ServiceProvider(service=JDialog.class, path="Plc4xDriver/modbus-ascii")
+@ServiceProvider(service=Plc4xDialog.class, path="Plc4xDriver/modbus-ascii")
 public class Plc4xModbusAsciiDialog extends JDialog implements Plc4xDialog {  
 
+    private final String DRIVER_CODE = "modbus-ascii";
+    private final MasterDB db = Lookup.getDefault().lookup(MasterDB.class);
+    
     public BeanNode node;
-    private DriverDBRecord driverrecord = null;
-    private DeviceDBRecord devicerecord = null;
+    private DriverRecord driverrecord = null;
+    private DeviceRecord devicerecord = null;
     private UUID uuid;
 
-    private Plc4xDialogParametersEnum parameters;
+    private Plc4xPropertyEnum parameters;
 
     public Plc4xModbusAsciiDialog() {
         super(new javax.swing.JFrame(), true);
@@ -362,23 +366,28 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     }// </editor-fold>//GEN-END:initComponents
 
     private void brOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_brOkActionPerformed
-        // TODO add your handling code here:
-        /*
-        final InstanceCookie cookie = node.getLookup().lookup(InstanceCookie.class);
-        final DeviceDBRecord dbr = (DeviceDBRecord) cookie.instanceCreate();
-        node.setValue(parameters.SERIAL_PORT.name(), (String) cbSerialPort.getSelectedItem());
-        node.setValue(parameters.BAUD_RATE.name(), (String) cbBaudRate.getSelectedItem());
-        node.setValue(parameters.DATA_BITS.name(), (String) cbBaudRate.getSelectedItem());
-        node.setValue(parameters.PARITY.name(), (String) cbParity.getSelectedItem());       
-        node.setValue(parameters.STOP_BITS.name(), (String) cbStopBits.getSelectedItem());        
-        node.setValue(parameters.TIMEOUT.name(), (String) cbTimeOut.getSelectedItem());
-        */
-        if ((driverrecord != null) && (devicerecord != null)) {
-
-            devicerecord.setDeviceName(tfDeviceName.getText());
-            devicerecord.setUUID(UUID.fromString(tfUUID.getText()));            
-            driverrecord.getMapDevices().put(devicerecord.getUUID(), devicerecord);
-        }        
+     
+        driverrecord = db.getDriverByCode(DRIVER_CODE);
+        devicerecord = db.createDeviceDBRecord();
+
+        final DeviceRecord dbdevice = driverrecord.getDevice(tfDeviceName.getText().trim());
+        
+        if ((driverrecord != null) && (devicerecord != null) && (dbdevice == null)) {
+
+            devicerecord.setDeviceName(tfDeviceName.getText().trim());
+            devicerecord.setDeviceName(tfDeviceName.getText().trim());            
+            devicerecord.setUUID(UUID.fromString(tfUUID.getText()));  
+            
+            devicerecord.getProperties().put(parameters.SERIAL_PORT.name(), (String) cbSerialPort.getSelectedItem());
+            devicerecord.getProperties().put(parameters.BAUD_RATE.name(), (String) cbBaudRate.getSelectedItem());
+            devicerecord.getProperties().put(parameters.DATA_BITS.name(), (String) cbBaudRate.getSelectedItem());
+            devicerecord.getProperties().put(parameters.PARITY.name(), (String) cbParity.getSelectedItem());  
+            devicerecord.getProperties().put(parameters.STOP_BITS.name(), (String) cbStopBits.getSelectedItem());            
+            devicerecord.getProperties().put(parameters.TIMEOUT.name(), (String) tfTimeOut.getText());             
+           
+            driverrecord.addDevice(devicerecord);
+                                     
+        }      
 
         this.setVisible(false);
     }//GEN-LAST:event_brOkActionPerformed
@@ -487,7 +496,7 @@ public void setNode(Node node) {
         final InstanceCookie cookie = node.getLookup().lookup(InstanceCookie.class);
         driverrecord = null;
         try {
-            driverrecord = (DriverDBRecord) cookie.instanceCreate();
+            driverrecord = (DriverRecord) cookie.instanceCreate();
             initfields();
         } catch (IOException | ClassNotFoundException ex) {
             Exceptions.printStackTrace(ex);
@@ -496,7 +505,9 @@ public void setNode(Node node) {
 
     private void initfields() {
         if (driverrecord != null) {
-            devicerecord = (DeviceDBRecord) node.getValue("DEVICE");
+            
+            devicerecord = (DeviceRecord) node.getValue("DEVICE");
+            
             tfDeviceProtocol.setText(driverrecord.getProtocolCode());
 
             tfDeviceName.setText("");
@@ -509,7 +520,7 @@ private void initfields() {
             //Default no S88 node selected
             tfS88UUID.setText("");
 
-            
+            //Default to 3 seconds delay
             tfTimeOut.setText("3");
 
         }