diff --git a/Examples/Applications/Incidone/Incidone/Integration/Asterisk.icl b/Examples/Applications/Incidone/Incidone/Integration/Asterisk.icl index ab27dd7b080c7aaf32086316172b1c15e6fbd1bc..c64fbceec44a3af9e8f6705beefe951c6b413c93 100644 --- a/Examples/Applications/Incidone/Incidone/Integration/Asterisk.icl +++ b/Examples/Applications/Incidone/Incidone/Integration/Asterisk.icl @@ -8,6 +8,7 @@ import Incidone.OP.CommunicationManagementTasks import Incidone.Util.TaskPatterns import Text, Data.Either import qualified Data.Map as DM +import Data.Map.GenJSON :: AsteriskEvent :== Map String String // Simple key/value mapping diff --git a/Examples/Applications/Incidone/Incidone/OP/ContactManagementTasks.icl b/Examples/Applications/Incidone/Incidone/OP/ContactManagementTasks.icl index 1c89253628344ccb2bc19393646620b4e48d1e93..54d615d1f976951b119ba4c43663fab3dbdf579d 100644 --- a/Examples/Applications/Incidone/Incidone/OP/ContactManagementTasks.icl +++ b/Examples/Applications/Incidone/Incidone/OP/ContactManagementTasks.icl @@ -9,6 +9,7 @@ import Incidone.DeviceBased.VideoWall import Incidone.Extensions.CrewLists //For demo import qualified Data.Map as DM +import Data.Map.GenJSON import Text, Text.HTML, Data.Either, Data.Functor import iTasks.UI.Editor.Controls diff --git a/Examples/Applications/Incidone/Incidone/OP/IncidentManagementTasks.icl b/Examples/Applications/Incidone/Incidone/OP/IncidentManagementTasks.icl index da8f1d800a40576fcc841db43a4f24dadb7f477b..1119fba71758fe1301872ac7f00e86f84a91ef15 100644 --- a/Examples/Applications/Incidone/Incidone/OP/IncidentManagementTasks.icl +++ b/Examples/Applications/Incidone/Incidone/OP/IncidentManagementTasks.icl @@ -11,6 +11,7 @@ import Incidone.DeviceBased.VideoWall import Incidone.ActionManagementTasks import Data.List, Data.Either import qualified Data.Map as DM +import Data.Map.GenJSON import Text.HTML openIncidentInWorkspace :: Workspace IncidentNo -> Task () diff --git a/Examples/Applications/Incidone/Incidone/OP/SDSs.icl b/Examples/Applications/Incidone/Incidone/OP/SDSs.icl index 352403073b67a05238231b77e962077801695a06..877a1fee278574a3d254919d693decd5910ecc0d 100644 --- a/Examples/Applications/Incidone/Incidone/OP/SDSs.icl +++ b/Examples/Applications/Incidone/Incidone/OP/SDSs.icl @@ -2,6 +2,7 @@ implementation module Incidone.OP.SDSs import iTasks, iTasks.Extensions.SQLDatabase import qualified Data.Map as DM +import Data.Map.GenJSON import Incidone.Configuration import Incidone.OP.Concepts, Incidone.OP.Conversions import Incidone.Util.SQLSDS diff --git a/Examples/Applications/Incidone/Incidone/Util/TaskPatterns.icl b/Examples/Applications/Incidone/Incidone/Util/TaskPatterns.icl index c151987c561beb6675c5460cb4969e0797f080ff..cce529b449394f94e7c8d8b3bf16765308b38943 100644 --- a/Examples/Applications/Incidone/Incidone/Util/TaskPatterns.icl +++ b/Examples/Applications/Incidone/Incidone/Util/TaskPatterns.icl @@ -5,6 +5,7 @@ import iTasks.UI.Definition import Incidone.OP.IncidentManagementTasks, Incidone.OP.ContactManagementTasks import Text, Data.Functor, Data.Either, Data.Maybe import qualified Data.Map as DM +import Data.Map.GenJSON import StdMisc //FIXME diff --git a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Core.icl b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Core.icl index f2cfb79226701a0ae6657d6e2243166db0e0d3f5..1b40765e3ad8ac7ac61407c6bfb64bb38cf483f2 100644 --- a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Core.icl +++ b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Core.icl @@ -5,6 +5,7 @@ import iTasks.Extensions.SVG.SVGEditor //import Graphics.Scalable import qualified Data.List as DL import qualified Data.Map as DM +import Data.Map.GenJSON import qualified Data.IntMap.Strict as DIS import qualified Data.Set as DS from Data.Func import mapSt diff --git a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Editor.icl b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Editor.icl index 0674701f430afefa07eb9f588a117acf84cc9ed9..dc7a7cc0a9f226e8660f689eea8af591ca2e7e6c 100644 --- a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Editor.icl +++ b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Editor.icl @@ -13,6 +13,7 @@ import C2.Framework.MapEnvironment import C2.Apps.ShipAdventure.Types import C2.Apps.ShipAdventure.Images import qualified Data.Map as DM +import Data.Map.GenJSON import qualified Data.IntMap.Strict as DIS import qualified Data.Set as DS diff --git a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Scripting.icl b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Scripting.icl index 7a4ce981a7ba6985cd59fd061baf6e281ddc963c..a850b8bcec8ee1c0279deca5f8d718a5debe585e 100644 --- a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Scripting.icl +++ b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Scripting.icl @@ -7,6 +7,7 @@ import C2.Apps.ShipAdventure.PathFinding import C2.Apps.ShipAdventure.Util import qualified Data.IntMap.Strict as DIS import qualified Data.Map as DM +import Data.Map.GenJSON // scripted simulation diff --git a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Types.icl b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Types.icl index cc8a3739099ead0006ec1ce8cc6bcb6f262501c4..459317b9efcebc86ecdc9784b43ea3ea454014d1 100644 --- a/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Types.icl +++ b/Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Types.icl @@ -12,6 +12,7 @@ import StdArray import Data.Data, Data.Either import qualified Data.IntMap.Strict as DIS import qualified Data.Map as DM +import Data.Map.GenJSON import qualified Data.Set as DS import Text.HTML diff --git a/Examples/Applications/ShipAdventure/C2/Framework/Entity.icl b/Examples/Applications/ShipAdventure/C2/Framework/Entity.icl index 61b8ad6d16c55d005039f46a82a6b36c07f89622..187a97762d912468ef1981b286fb68bcd62666d1 100644 --- a/Examples/Applications/ShipAdventure/C2/Framework/Entity.icl +++ b/Examples/Applications/ShipAdventure/C2/Framework/Entity.icl @@ -4,6 +4,7 @@ import iTasks import StdReal, StdOverloaded import C2.Framework.GeoRoutines import qualified Data.Map as DM +import Data.Map.GenJSON derive class iTask Entity, Position, RelPos, MovingPos, Structure, RectStruct, Behaviour, Angle diff --git a/Examples/Applications/ShipAdventure/C2/Framework/MapEnvironment.icl b/Examples/Applications/ShipAdventure/C2/Framework/MapEnvironment.icl index adf23cb32f5817ac86064950bb71909049fd6869..7336cf85d62ad9ea75eab1ab822a29bd2fffff70 100644 --- a/Examples/Applications/ShipAdventure/C2/Framework/MapEnvironment.icl +++ b/Examples/Applications/ShipAdventure/C2/Framework/MapEnvironment.icl @@ -9,6 +9,7 @@ import iTasks.Extensions.Admin.TonicAdmin import iTasks.Extensions.DateTime import qualified Data.Map as DM from Data.Map import :: Map, instance Functor (Map k) +import Data.Map.GenJSON import qualified Data.IntMap.Strict as DIS from Data.IntMap.Strict import :: IntMap import qualified Data.Heap as DH diff --git a/Examples/Applications/ShipAdventure/C2/Navy/Roles/DOff.icl b/Examples/Applications/ShipAdventure/C2/Navy/Roles/DOff.icl index 65f38994529f47a4afd9aea68d70e0468a22a262..aebedbd8d2f46cb8a09f67e3ea474a5f6a253e51 100644 --- a/Examples/Applications/ShipAdventure/C2/Navy/Roles/DOff.icl +++ b/Examples/Applications/ShipAdventure/C2/Navy/Roles/DOff.icl @@ -8,6 +8,7 @@ import qualified Data.Set as DS from Data.IntMap.Strict import instance Functor IntMap import qualified Data.IntMap.Strict as DIS import C2.Apps.ShipAdventure.Editor +import Data.Map.GenJSON dOffRegisterEntity :: [User -> Task Entity] dOffRegisterEntity = [] diff --git a/Libraries/iTasks/Extensions/FileCollection.icl b/Libraries/iTasks/Extensions/FileCollection.icl index 695c226bdffbf56bb5e1b387b7b9cc5348b837f7..3943f0761df5d5e07f9a083a674f4f976727c008 100644 --- a/Libraries/iTasks/Extensions/FileCollection.icl +++ b/Libraries/iTasks/Extensions/FileCollection.icl @@ -10,6 +10,7 @@ import iTasks.Internal.Util import StdFile from Data.Map import :: Map import qualified Data.Map as DM +import Data.Map.GenJSON import Data.Error, Data.Functor, Data.Maybe, Text import System.Directory, System.File, System.FilePath, System.OS diff --git a/Libraries/iTasks/Extensions/Web.icl b/Libraries/iTasks/Extensions/Web.icl index 4c1691ae530d349d1e39d3ab109e1d60b860e505..33cc88168f685a6ec952044341b3e84e68bbfd18 100644 --- a/Libraries/iTasks/Extensions/Web.icl +++ b/Libraries/iTasks/Extensions/Web.icl @@ -11,6 +11,7 @@ import iTasks.Extensions.Document import iTasks.Extensions.TextFile import qualified Data.Map as DM +import Data.Map.GenJSON import qualified Data.List as DL //* URL diff --git a/Libraries/iTasks/Internal/Distributed/Instance.icl b/Libraries/iTasks/Internal/Distributed/Instance.icl index 431f88885e8e20b79dfb8b1c42b00f0345ff306d..6a27df8326bb40c885e42a4ed042341c7e3259f1 100644 --- a/Libraries/iTasks/Internal/Distributed/Instance.icl +++ b/Libraries/iTasks/Internal/Distributed/Instance.icl @@ -3,6 +3,7 @@ implementation module iTasks.Internal.Distributed.Instance import iTasks from Text import class Text, instance Text String import qualified Data.Map as DM +import Data.Map.GenJSON import qualified Text as T import Text.Encodings.Base64 import iTasks.Extensions.Distributed._Formatter diff --git a/Tools/CodeQualityMonitor.icl b/Tools/CodeQualityMonitor.icl index 6f3f628b6ab6fb04044e7c29d42d9ead54ade475..fd998b22c52d5b58ab749d3265d683ed7b0f0227 100644 --- a/Tools/CodeQualityMonitor.icl +++ b/Tools/CodeQualityMonitor.icl @@ -8,6 +8,7 @@ import System.OS import Text, Text.HTML import Data.List, Data.Func import qualified Data.Map as DM +import Data.Map.GenJSON import Testing.TestEvents import iTasks