Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
a777e86d
Unverified
Commit
a777e86d
authored
6 years ago
by
Vladimir Krivosheev
Browse files
Options
Download
Email Patches
Plain Diff
cleanup, avoid sugar (.element)
parent
651502d0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/compiler/impl/src/com/intellij/compiler/ExternalCompilerConfigurationStorage.kt
+9
-6
...intellij/compiler/ExternalCompilerConfigurationStorage.kt
with
9 additions
and
6 deletions
+9
-6
java/compiler/impl/src/com/intellij/compiler/ExternalCompilerConfigurationStorage.kt
+
9
-
6
View file @
a777e86d
...
...
@@ -10,7 +10,6 @@ import com.intellij.openapi.project.isExternalStorageEnabled
import
com.intellij.openapi.roots.ExternalProjectSystemRegistry
import
com.intellij.openapi.roots.ProjectModelElement
import
com.intellij.openapi.roots.ProjectModelExternalSource
import
com.intellij.util.element
import
gnu.trove.THashMap
import
org.jdom.Element
import
org.jetbrains.jps.model.serialization.java.compiler.JpsJavaCompilerConfigurationSerializer
...
...
@@ -22,17 +21,19 @@ internal class ExternalCompilerConfigurationStorage(private val project: Project
private
set
override
fun
getState
():
Element
{
val
e
=
Element
(
"state"
)
val
result
=
Element
(
"state"
)
if
(!
project
.
isExternalStorageEnabled
)
{
return
e
return
result
}
val
map
=
(
CompilerConfigurationImpl
.
getInstance
(
project
)
as
CompilerConfigurationImpl
).
modulesBytecodeTargetMap
val
moduleNames
=
getFilteredModuleNameList
(
project
,
map
,
true
)
if
(
moduleNames
.
isNotEmpty
())
{
writeBytecodeTarget
(
moduleNames
,
map
,
e
.
element
(
JpsJavaCompilerConfigurationSerializer
.
BYTECODE_TARGET_LEVEL
))
val
element
=
Element
(
JpsJavaCompilerConfigurationSerializer
.
BYTECODE_TARGET_LEVEL
)
writeBytecodeTarget
(
moduleNames
,
map
,
element
)
result
.
addContent
(
element
)
}
return
e
return
result
}
override
fun
loadState
(
state
:
Element
)
{
...
...
@@ -73,9 +74,11 @@ internal fun getFilteredModuleNameList(project: Project, map: Map<String, String
internal
fun
writeBytecodeTarget
(
moduleNames
:
List
<
String
>,
map
:
Map
<
String
,
String
>,
element
:
Element
)
{
Collections
.
sort
(
moduleNames
,
String
.
CASE_INSENSITIVE_ORDER
)
for
(
name
in
moduleNames
)
{
val
moduleElement
=
element
.
e
lement
(
JpsJavaCompilerConfigurationSerializer
.
MODULE
)
val
moduleElement
=
E
lement
(
JpsJavaCompilerConfigurationSerializer
.
MODULE
)
moduleElement
.
setAttribute
(
JpsJavaCompilerConfigurationSerializer
.
NAME
,
name
)
moduleElement
.
setAttribute
(
JpsJavaCompilerConfigurationSerializer
.
TARGET_ATTRIBUTE
,
map
.
get
(
name
)
?:
""
)
element
.
addContent
(
moduleElement
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help