twentefp-eventloop-trees 0.1.1.0 → 0.1.2.0

raw patch · 2 files changed

+16/−11 lines, 2 filesdep ~eventloopPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: eventloop

API changes (from Hackage documentation)

Files

• src/FPPrac/Trees.hs +14/−9
• twentefp-eventloop-trees.cabal +2/−2

@@ -15,9 +15,11 @@     
 import Prelude
 
-import Eventloop.EventloopCore
-import Eventloop.Types.EventTypes
+import Eventloop.Core
+import Eventloop.Types.Events
+import Eventloop.Types.System
 import Eventloop.DefaultConfiguration
+
 import qualified Eventloop.Module.Websocket.Canvas as C
 import Eventloop.Module.DrawTrees
 import Eventloop.Module.BasicShapes
@@ -28,12 +30,15 @@ 
 beginProgramState = ProgramState
 
-eventloopConfig trees = defaultConfig { moduleConfigurations=[ defaultDrawTreesModuleConfiguration
-                                                             , defaultBasicShapesModuleConfiguration
-                                                             , C.defaultCanvasModuleConfiguration
-                                                             ]}
-                where
-                    defaultConfig = allModulesEventloopConfiguration beginProgramState (eventloop trees)
+eventloopConfiguration trees
+    = EventloopSetupConfiguration
+        { beginProgstate = beginProgramState
+        , eventloopF = eventloop trees
+        , setupModuleConfigurations = [ setupDrawTreesModuleConfiguration
+                                      , setupBasicShapesModuleConfiguration
+                                      , C.setupCanvasModuleConfiguration
+                                      ]
+        }
 
 
 
@@ -66,4 +71,4 @@ showTree tree = showTreeList [tree]
 
 showTreeList :: (GeneralizeTree a) => [a] -> IO ()
-showTreeList trees = startMainloop (eventloopConfig $ map generalizeTree trees)+showTreeList trees = startEventloopSystem (eventloopConfiguration $ map generalizeTree trees)

@@ -1,5 +1,5 @@ name:                twentefp-eventloop-trees
-version:             0.1.1.0
+version:             0.1.2.0
 synopsis:            Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree
 license:             BSD3
 license-file:        LICENSE
@@ -14,7 +14,7 @@    
   build-depends:       
         base >=4.6 && <5,
-        eventloop >= 0.4.0.0 && < 0.5.0.0
+        eventloop >= 0.5.0.0 && < 0.6.0.0
         
   hs-source-dirs:      src
   default-language:    Haskell2010