To new Structure

Zway-Bot/Moduls/CronJob.cs

@@ -6,7 +6,7 @@ using BlubbFish.Utils.IoT.Bots;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Moduls;
 
-namespace ZwayBot.Moduls {
+namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
   internal class CronJob : CronJob<ZwayController> {
     public override event ModulEvent Update;
 

Zway-Bot/Moduls/Mqtt.cs

@@ -12,7 +12,7 @@ using BlubbFish.Utils.IoT.Events;
 using BlubbFish.Utils.IoT.Interfaces;
 using LitJson;
 
-namespace ZwayBot.Moduls {
+namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
   class Mqtt : Mqtt<ZwayController> {
     public override event ModulEvent Update;
 

Zway-Bot/Moduls/Overtaker.cs

@@ -8,7 +8,7 @@ using BlubbFish.Utils.IoT.Bots;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Moduls;
 
-namespace ZwayBot.Moduls {
+namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
   internal class Overtaker : Overtaker<ZwayController> {
     private readonly Dictionary<String, ACommandClass> overtakeritems = new Dictionary<String, ACommandClass>();
     public override event ModulEvent Update;

Zway-Bot/Moduls/Senml.cs

@@ -8,7 +8,7 @@ using BlubbFish.Utils.IoT.Connector;
 using BlubbFish.Utils.IoT.Events;
 using BlubbFish.Utils.IoT.Interfaces;
 
-namespace ZwayBot.Moduls {
+namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
   class Senml : Mqtt {
     public override event ModulEvent Update;
     private readonly String SenmlGuid;

Zway-Bot/Moduls/StatusPolling.cs

@@ -7,7 +7,7 @@ using BlubbFish.Utils;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Moduls;
 
-namespace ZwayBot.Moduls {
+namespace BlubbFish.IoT.Bots.ZwayBot.Moduls {
   class Statuspolling : Statuspolling<ZwayController> {
     public override event ModulEvent Update;
 

Zway-Bot/Program.cs

@@ -4,8 +4,8 @@ using BlubbFish.IoT.Zway;
 using BlubbFish.Utils;
 using BlubbFish.Utils.IoT.Bots;
 
-namespace ZwayBot {
-  class Program : Bot {
+namespace BlubbFish.IoT.Bots.ZwayBot {
+  class Program : Bot<ZwayController> {
     static void Main(String[] args) => new Program(args);
 
     public Program(String[] args) {
@@ -23,15 +23,15 @@ namespace ZwayBot {
       this.logger.SetPath(InIReader.GetInstance("settings").GetValue("logging", "path"));
       ZwayController zw = new ZwayController(InIReader.GetInstance("settings").GetSection("zway"), names, false);
       zw.Update += this.ZwayDataUpate;
-      this.ModulLoader<ZwayController>("ZwayBot.Moduls", zw);
-      this.ModulInterconnect<ZwayController>();
-      this.ModulEvents<ZwayController>();
+      this.ModulLoader("BlubbFish.IoT.Bots.ZwayBot.Moduls", zw);
+      this.ModulInterconnect();
+      this.ModulEvents();
       this.WaitForShutdown();
-      this.ModulDispose<ZwayController>();
+      this.ModulDispose();
       zw.Dispose();
     }    
 
-    private void ZwayDataUpate(Object sender, BlubbFish.IoT.Zway.Events.DeviceUpdateEvent e) {
+    private void ZwayDataUpate(Object sender, Zway.Events.DeviceUpdateEvent e) {
       Console.WriteLine("-> ZW [" + e.UpdateTime + "]: " + e.Parent.ToString());
     }
   }

Zway-Bot/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ZwayBot.Properties {
+namespace BlubbFish.IoT.Bots.ZwayBot.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace ZwayBot.Properties {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZwayBot.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BlubbFish.IoT.Bots.ZwayBot.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

Zway-Bot/Zway-Bot.csproj

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{AEF8059F-8AEF-45C7-85C4-318C8F797900}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>ZwayBot</RootNamespace>
+    <RootNamespace>BlubbFish.IoT.Bots.ZwayBot</RootNamespace>
     <AssemblyName>Zway-Bot</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -35,7 +35,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>ZwayBot.Program</StartupObject>
+    <StartupObject>BlubbFish.IoT.Bots.ZwayBot.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>