[548985] Wrong Transitions in Adapter ECC and wrong data type

The ECC was wrong in the FB NewAdapter2 and the datatypes of the
Adapter-data "Test Adapter" was also wrong.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=548985
Change-Id: I0be6951987f9cc4b254f89b89a326e428ebdc523
Signed-off-by: Jan Holzweber <j.holzweber@gmx.at>
diff --git a/SystemTests/testfbforcodegenerator/Adapters/NewAdapter2.fbt b/SystemTests/testfbforcodegenerator/Adapters/NewAdapter2.fbt
index 242b0f8..3e7abe8 100644
--- a/SystemTests/testfbforcodegenerator/Adapters/NewAdapter2.fbt
+++ b/SystemTests/testfbforcodegenerator/Adapters/NewAdapter2.fbt
@@ -23,13 +23,18 @@
     <ECC>

       <ECState Comment="Initial State" Name="START" x="600.0" y="400.0"/>

       <ECState Comment="" Name="State" x="3965.0" y="645.0">

-        <ECAction Algorithm="OUT" Output="TestAdapter.EI"/>

+        <ECAction Algorithm="OUT" Output="EO"/>

       </ECState>

-      <ECTransition Comment="" Condition="[TestAdapter.CNF]" Destination="State" Source="START" x="2405.0" y="585.0"/>

+      <ECState Comment="" Name="State_1" x="1760.0" y="2145.0">

+        <ECAction Output="TestAdapter.EI"/>

+      </ECState>

+      <ECTransition Comment="" Condition="TestAdapter.EO" Destination="State" Source="START" x="2405.0" y="585.0"/>

       <ECTransition Comment="" Condition="1" Destination="START" Source="State" x="2365.0" y="1120.0"/>

+      <ECTransition Comment="" Condition="EI" Destination="State_1" Source="START" x="1300.0" y="1330.0"/>

+      <ECTransition Comment="" Condition="1" Destination="START" Source="State_1" x="835.0" y="1595.0"/>

     </ECC>

     <Algorithm Comment="new algorithm" Name="OUT">

-      <ST Text="O:= TestAdapter.D0;&#13;&#10;TestAdapter.DI:= 1 +D0;"/>

+      <ST Text="O:= TestAdapter.D0;&#13;&#10;TestAdapter.DI:= TestAdapter.D0;"/>

     </Algorithm>

   </BasicFB>

 </FBType>

diff --git a/SystemTests/testfbforcodegenerator/Adapters/TestAdapter.adp b/SystemTests/testfbforcodegenerator/Adapters/TestAdapter.adp
index d467c1c..28310a6 100644
--- a/SystemTests/testfbforcodegenerator/Adapters/TestAdapter.adp
+++ b/SystemTests/testfbforcodegenerator/Adapters/TestAdapter.adp
@@ -15,10 +15,10 @@
       </Event>

     </EventOutputs>

     <InputVars>

-      <VarDeclaration Comment="Request Data from Socket" Name="DI" Type="WSTRING"/>

+      <VarDeclaration Comment="Request Data from Socket" Name="DI" Type="INT"/>

     </InputVars>

     <OutputVars>

-      <VarDeclaration Comment="Confirmation Data from Plug" Name="D0" Type="WSTRING"/>

+      <VarDeclaration Comment="Confirmation Data from Plug" Name="D0" Type="INT"/>

     </OutputVars>

   </InterfaceList>

   <Service Comment="Adapter Interface" LeftInterface="SOCKET" RightInterface="PLUG">