Changeset 414 for PinConnection

Timestamp:

Aug 17, 2012, 9:53:11 AM (12 years ago)

Author:

chronos

Message:

• Fixed: Use parent TCommNode Active property instead custom in PinConnection package.

Location:

PinConnection

Files:

• UCommConcentrator.pas (modified) (2 diffs)
• UCommDelay.pas (modified) (5 diffs)
• UCommHub.pas (modified) (3 diffs)
• UCommMark.pas (modified) (4 diffs)
• UCommPin.pas (modified) (2 diffs)
• UCommSerialPort.pas (modified) (2 diffs)
• UCommTelnet.pas (modified) (1 diff)
• UCommThread.pas (modified) (3 diffs)
• UPacketBurst.pas (modified) (4 diffs)

PinConnection/UCommConcentrator.pas

@@ -40 +40 @@
     property Pins: TPinList read FPins write FPins;
     property Main: TCommPin read FMain write FMain;
-    property Active: Boolean read FActive write FActive;
   end;
 
@@ -122 +121 @@
 destructor TCommConcentrator.Destroy;
 begin
-  FActive := False;
-  FPins.Free;
-  FMain.Free;
+  Active := False;
+  FreeAndNil(FPins);
+  FreeAndNil(FMain);
   inherited Destroy;
 end;

PinConnection/UCommDelay.pas

@@ -35 +35 @@
   TCommDelay = class(TCommNode)
   private
-    FActive: Boolean;
     FDelay: TDateTime;
     PacketQueue1: TListObject; // TListObject<TDelayedPacket>
@@ -43 +42 @@
     procedure ReceiveData1(Sender: TCommPin; AStream: TListByte);
     procedure ReceiveData2(Sender: TCommPin; AStream: TListByte);
-    procedure SetActive(AValue: Boolean);
+  protected
+    procedure SetActive(const AValue: Boolean); override;
   public
     Lock1: TCriticalSection;
@@ -52 +52 @@
     destructor Destroy; override;
     property Delay: TDateTime read FDelay write FDelay;
-    property Active: Boolean read FActive write SetActive;
   end;
 
@@ -141 +140 @@
 end;
 
-procedure TCommDelay.SetActive(AValue: Boolean);
+procedure TCommDelay.SetActive(const AValue: Boolean);
 begin
   if FActive = AValue then Exit;
@@ -167 +166 @@
     FreeAndNil(Thread2);
   end;
+  inherited;
 end;
 

PinConnection/UCommHub.pas

@@ -25 +25 @@
   TCommHub = class(TCommNode)
   private
-    FActive: Boolean;
     FPins: TPinList;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
@@ -33 +32 @@
     destructor Destroy; override;
     property Pins: TPinList read FPins write FPins;
-    property Active: Boolean read FActive write FActive;
   end;
 
@@ -103 +101 @@
 begin
   Active := False;
-  FPins.Free;
-  inherited Destroy;
+  FreeAndNil(FPins);
+  inherited;
 end;
 

PinConnection/UCommMark.pas

@@ -14 +14 @@
   TCommMark = class(TCommNode)
   private
-    FActive: Boolean;
     FMarkIndex: Integer;
     FFrameData: TListByte;
@@ -21 +20 @@
     procedure FrameDataReceive(Sender: TCommPin; Stream: TListByte);
     procedure FrameSetStatus(Sender: TCommPin; Status: Integer);
-    procedure SetActive(AValue: Boolean);
+  protected
+    procedure SetActive(const AValue: Boolean); override;
   public
     PinRaw: TCommPin;
@@ -29 +29 @@
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-    property Active: Boolean read FActive write SetActive;
   end;
 
@@ -75 +74 @@
 end;
 
-procedure TCommMark.SetActive(AValue: Boolean);
+procedure TCommMark.SetActive(const AValue: Boolean);
 begin
   if FActive = AValue then Exit;
   FActive := AValue;
   if FActive then Reset;
+  inherited;
 end;
 

PinConnection/UCommPin.pas

@@ -58 +58 @@
   TCommNode = class(TComponent)
   private
+  protected
     FActive: Boolean;
-  protected
-    procedure SetActive(AValue: Boolean); virtual;
+    procedure SetActive(const AValue: Boolean); virtual;
   public
     property Active: Boolean read FActive write SetActive;
@@ -70 +70 @@
 { TCommNode }
 
-procedure TCommNode.SetActive(AValue: Boolean);
+procedure TCommNode.SetActive(const AValue: Boolean);
 begin
   if FActive = AValue then Exit;

PinConnection/UCommSerialPort.pas

@@ -19 +19 @@
     procedure ReceiveData(Stream: TListByte);
   protected
-    procedure SetActive(AValue: Boolean); override;
+    procedure SetActive(const AValue: Boolean); override;
   public
     SerialPort: TSerialPort;
@@ -39 +39 @@
 end;
 
-procedure TCommSerialPort.SetActive(AValue: Boolean);
+procedure TCommSerialPort.SetActive(const AValue: Boolean);
 begin
-  inherited SetActive(AValue);
+  inherited;
   SerialPort.Active := AValue;
 end;

PinConnection/UCommTelnet.pas

@@ -419 +419 @@
 destructor TCommTelnet.Destroy;
 begin
-  FCommandData.Free;
-  Options.Free;
-  TelnetPin.Free;
-  RawPin.Free;
-  FResponses.Free;
+  FreeAndNil(FCommandData);
+  FreeAndNil(Options);
+  FreeAndNil(TelnetPin);
+  FreeAndNil(RawPin);
+  FreeAndNil(FResponses);
   inherited Destroy;
 end;

PinConnection/UCommThread.pas

@@ -30 +30 @@
   TCommThread = class(TCommNode)
   private
-    FActive: Boolean;
     FOnReceiveData: TReceiveDataEvent;
     FReceiveThread: TCommThreadReceiveThread;
@@ -42 +41 @@
     procedure ExtReceiveData(Sender: TCommPin; Stream: TListByte);
     procedure ExtSetStatus(Sender: TCommPin; AStatus: Integer);
-    procedure SetActive(const AValue: Boolean);
+  protected
+    procedure SetActive(const AValue: Boolean); override;
   public
     Ext: TCommPin;
     Pin: TCommPin;
-    property Active: Boolean read FActive write SetActive;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -101 +100 @@
     FreeAndNil(FReceiveThread);
   end;
+  inherited;
 end;
 

PinConnection/UPacketBurst.pas

@@ -21 +21 @@
   TPacketBurst = class(TCommNode)
   private
-    FActive: Boolean;
     SendThreadEvent: TEvent;
     SendThread: TPacketBurstSendThread;
@@ -29 +28 @@
     procedure PacketSingleReceive(Sender: TCommPin; Stream: TListByte);
     procedure PacketBurstReceive(Sender: TCommPin; Stream: TListByte);
-    procedure SetActive(const AValue: Boolean);
+  protected
+    procedure SetActive(const AValue: Boolean); override;
   public
     SendPeriod: Integer;
@@ -37 +37 @@
     destructor Destroy; override;
     constructor Create(AOwner: TComponent); override;
-    property Active: Boolean read FActive write SetActive;
   end;
 
@@ -101 +100 @@
     FreeAndNil(SendThread);
   end;
+  inherited;
 end;