Replaced imports with require's.

muhuk · Jan 8, 2015 · 22de34f592ca6cf3609e0822b9fd2ce6bf30afd0 · 22de34f
1 parent b6fc151
commit 22de34f592ca6cf3609e0822b9fd2ce6bf30afd0
diff --git a/clecs-tetris/project.clj b/clecs-tetris/project.clj
@@ -4,8 +4,8 @@
  :license {:name "GNU GPL v3"
            :url "http://www.gnu.org/licenses/gpl-3.0.en.html"}
  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [clecs "1.0.2-SNAPSHOT"]
-                 [seesaw "1.4.4"]]
+                 [clecs "1.1.0-SNAPSHOT"]
+                 [seesaw "1.4.5"]]
  :main ^:skip-aot clecs-tetris.core
  :target-path "target/%s"
  :profiles {:dev {:dependencies [[midje "1.6.3"]]}
diff --git a/clecs-tetris/src/clecs_tetris/world/system/gravity.clj b/clecs-tetris/src/clecs_tetris/world/system/gravity.clj
@@ -3,11 +3,10 @@
            [clecs.world :as world]
            [clecs-tetris.world.component :refer [->CurrentShapeComponent
                                                  ->GlassTileComponent
-                                                  ->TargetLocationComponent]])
-  (:import [clecs_tetris.world.component
-            CurrentShapeComponent
-            GlassTileComponent
-            TargetLocationComponent]))
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  GlassTileComponent
+                                                  TargetLocationComponent]]))


 (declare -move-target-location)
diff --git a/clecs-tetris/src/clecs_tetris/world/system/new_shape.clj b/clecs-tetris/src/clecs_tetris/world/system/new_shape.clj
@@ -1,11 +1,11 @@
 (ns clecs-tetris.world.system.new-shape
  (:require [clecs-tetris.world.component :refer [->CurrentShapeComponent
-                                                  ->TargetLocationComponent]]
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  NextShapeComponent
+                                                  TargetLocationComponent]]
            [clecs.query :as query]
-            [clecs.world :as world])
-  (:import (clecs_tetris.world.component CurrentShapeComponent
-                                         NextShapeComponent
-                                         TargetLocationComponent)))
+            [clecs.world :as world]))


 (defn -can-create-new-shape? [w]
diff --git a/clecs-tetris/src/clecs_tetris/world/system/next_shape.clj b/clecs-tetris/src/clecs_tetris/world/system/next_shape.clj
@@ -1,8 +1,8 @@
 (ns clecs-tetris.world.system.next-shape
-  (:require [clecs-tetris.world.component :refer [->NextShapeComponent]]
+  (:require [clecs-tetris.world.component :refer [->NextShapeComponent
+                                                  NextShapeComponent]]
            [clecs.query :as query]
-            [clecs.world :as world])
-  (:import (clecs_tetris.world.component NextShapeComponent)))
+            [clecs.world :as world]))


 (defn -add-shape [shape]
diff --git a/clecs-tetris/src/clecs_tetris/world/system/rendering.clj b/clecs-tetris/src/clecs_tetris/world/system/rendering.clj
@@ -1,13 +1,12 @@
 (ns clecs-tetris.world.system.rendering
-  (:require [clecs-tetris.world.component]
+  (:require [clecs-tetris.world.component :refer [GlassTileComponent
+                                                  LevelComponent
+                                                  LinesDroppedComponent
+                                                  NextShapeComponent
+                                                  ScoreComponent]]
            [clecs-tetris.world.protocol :as protocol]
            [clecs.query :as query]
-            [clecs.world :as world])
-  (:import (clecs_tetris.world.component GlassTileComponent
-                                         LevelComponent
-                                         LinesDroppedComponent
-                                         NextShapeComponent
-                                         ScoreComponent)))
+            [clecs.world :as world]))


 (defn -get-next-shape [w]
diff --git a/clecs-tetris/src/clecs_tetris/world/system/update_shape.clj b/clecs-tetris/src/clecs_tetris/world/system/update_shape.clj
@@ -1,12 +1,12 @@
 (ns clecs-tetris.world.system.update-shape
  (:require [clecs-tetris.world.component :refer [->CurrentShapeComponent
                                                  ->GlassTileComponent
-                                                  ->TargetLocationComponent]]
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  GlassTileComponent
+                                                  TargetLocationComponent]]
            [clecs.query :as query]
-            [clecs.world :as world])
-  (:import (clecs_tetris.world.component CurrentShapeComponent
-                                         GlassTileComponent
-                                         TargetLocationComponent)))
+            [clecs.world :as world]))


 (defn -set-glass-tile [w x y tile]
diff --git a/clecs-tetris/test/clecs_tetris/world/system/gravity_test.clj b/clecs-tetris/test/clecs_tetris/world/system/gravity_test.clj
@@ -10,12 +10,12 @@
            [clecs.world :as world]
            [clecs-tetris.world.component :refer [->CurrentShapeComponent
                                                  ->GlassTileComponent
-                                                  ->TargetLocationComponent]]
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  GlassTileComponent
+                                                  TargetLocationComponent]]
            [clecs-tetris.world.system.gravity :refer :all]
-            [midje.sweet :refer :all])
-  (:import [clecs_tetris.world.component CurrentShapeComponent
-                                         GlassTileComponent
-                                         TargetLocationComponent]))
+            [midje.sweet :refer :all]))



diff --git a/clecs-tetris/test/clecs_tetris/world/system/new_shape_test.clj b/clecs-tetris/test/clecs_tetris/world/system/new_shape_test.clj
@@ -9,13 +9,12 @@
            [clecs.world :as world]
            [clecs-tetris.world.component :refer [->CurrentShapeComponent
                                                  ->NextShapeComponent
-                                                  ->TargetLocationComponent]]
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  NextShapeComponent
+                                                  TargetLocationComponent]]
            [clecs-tetris.world.system.new-shape :refer :all]
-            [midje.sweet :refer :all])
-  (:import [clecs_tetris.world.component
-            CurrentShapeComponent
-            NextShapeComponent
-            TargetLocationComponent]))
+            [midje.sweet :refer :all]))


 (fact "-can-create-new-shape? does nothing if there is a current shape."
diff --git a/clecs-tetris/test/clecs_tetris/world/system/next_shape_test.clj b/clecs-tetris/test/clecs_tetris/world/system/next_shape_test.clj
@@ -7,10 +7,10 @@
                                mock-world]]
            [clecs.query :as query]
            [clecs.world :as world]
-            [clecs-tetris.world.component :refer [->NextShapeComponent]]
+            [clecs-tetris.world.component :refer [->NextShapeComponent
+                                                  NextShapeComponent]]
            [clecs-tetris.world.system.next-shape :refer :all]
-            [midje.sweet :refer :all])
-  (:import [clecs_tetris.world.component NextShapeComponent]))
+            [midje.sweet :refer :all]))


 (fact "-add-shape creates transaction that adds a new NextShapeComponent."
diff --git a/clecs-tetris/test/clecs_tetris/world/system/rendering_test.clj b/clecs-tetris/test/clecs_tetris/world/system/rendering_test.clj
@@ -8,15 +8,14 @@
                                                  ->LinesDroppedComponent
                                                  ->NextShapeComponent
                                                  ->ScoreComponent
-                                                  ->GlassTileComponent]]
+                                                  ->GlassTileComponent
+                                                  LevelComponent
+                                                  LinesDroppedComponent
+                                                  NextShapeComponent
+                                                  ScoreComponent
+                                                  GlassTileComponent]]
            [clecs-tetris.world.system.rendering :refer :all]
-            [midje.sweet :refer :all])
-  (:import [clecs_tetris.world.component
-            LevelComponent
-            LinesDroppedComponent
-            NextShapeComponent
-            ScoreComponent
-            GlassTileComponent]))
+            [midje.sweet :refer :all]))


 (fact "-get-next-shape returns 4x4 tile grid of next shape."
diff --git a/clecs-tetris/test/clecs_tetris/world/system/update_shape_test.clj b/clecs-tetris/test/clecs_tetris/world/system/update_shape_test.clj
@@ -1,17 +1,17 @@
 (ns clecs-tetris.world.system.update-shape-test
  (:require [clecs-tetris.world.component :refer [->CurrentShapeComponent
                                                  ->GlassTileComponent
-                                                  ->TargetLocationComponent]]
+                                                  ->TargetLocationComponent
+                                                  CurrentShapeComponent
+                                                  GlassTileComponent
+                                                  TargetLocationComponent]]
            [clecs-tetris.world.system.update-shape :refer :all]
            [clecs.mock :refer [mock-component
                                mock-query
                                mock-set-component
                                mock-world]]
            [clecs.query :as query]
-            [midje.sweet :refer :all])
-  (:import (clecs_tetris.world.component CurrentShapeComponent
-                                         GlassTileComponent
-                                         TargetLocationComponent)))
+            [midje.sweet :refer :all]))


 (fact "-set-glass-tile sets one tile."