refactor name

This commit is contained in:
jem 2020-01-24 17:28:28 +01:00
parent ef9f30f040
commit 62839f5d3c
2 changed files with 6 additions and 6 deletions

View file

@ -29,10 +29,10 @@
(def Resource (def Resource
{:virtual-path VirtualPath {:virtual-path VirtualPath
:uri JavaUri
:java-path JavaPath
:source-type SourceType :source-type SourceType
:resource-type ResourceType}) :resource-type ResourceType
:java-uri JavaUri
:java-path JavaPath})
; ----------------------- Domain functions ------------------------ ; ----------------------- Domain functions ------------------------
(def no-link-option (into-array [LinkOption/NOFOLLOW_LINKS])) (def no-link-option (into-array [LinkOption/NOFOLLOW_LINKS]))
@ -44,7 +44,7 @@
source-type :- SourceType source-type :- SourceType
resource-type :- ResourceType] resource-type :- ResourceType]
{:virtual-path virtual-path {:virtual-path virtual-path
:uri uri :java-uri uri
:java-path java-path :java-path java-path
:source-type source-type :source-type source-type
:resource-type resource-type}) :resource-type resource-type})
@ -52,7 +52,7 @@
java-path :- JavaPath java-path :- JavaPath
source-type :- SourceType] source-type :- SourceType]
{:virtual-path virtual-path {:virtual-path virtual-path
:uri (.toUri java-path) :java-uri (.toUri java-path)
:java-path java-path :java-path java-path
:source-type source-type :source-type source-type
:resource-type (cond :resource-type (cond

View file

@ -545,7 +545,7 @@
file-resource-prefix "resources/" file-resource-prefix "resources/"
file-target-prefix "target/" file-target-prefix "target/"
resource-prefix (str "templates/themes/" theme) resource-prefix (str "templates/themes/" theme)
resource-file-uri (:uri resource-file-uri (:java-uri
(cp-io/resource-from-cp-or-fs (cp-io/resource-from-cp-or-fs
file-resource-prefix resource-prefix "" file-resource-prefix resource-prefix ""
:from-cp false)) :from-cp false))