Kotlin 1.2.20

build.gradle

@@ -7,7 +7,7 @@ buildDir = file('build/gradle')
 ext.externalLibsDir = file("$buildDir/externalLibs")
 
 buildscript {scriptHandler ->
-    ext.kotlinVersion = '1.2.0'
+    ext.kotlinVersion = '1.2.20'
 
     repositories {
         flatDir {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/BrowserTab.kt

@@ -149,9 +149,9 @@ class BrowserTab(val fileName: String, val moduleName: String, frame: BrowserFra
     }
 
     companion object {
-        val NODE_NAME = "tab"
-        private val ATTRIBUTE_FILE_NAME = "fileName"
-        private val ATTRIBUTE_MODULE_NAME = "moduleName"
+        const val NODE_NAME = "tab"
+        private const val ATTRIBUTE_FILE_NAME = "fileName"
+        private const val ATTRIBUTE_MODULE_NAME = "moduleName"
 
         fun create(element: Element, frame: BrowserFrame): BrowserTab =
                 BrowserTab(element.getAttribute(ATTRIBUTE_FILE_NAME), element.getAttributeNode(ATTRIBUTE_MODULE_NAME)?.value ?: ClasspathEntry.UNNAMED_MODULE, frame)

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/BrowserTreePane.kt

@@ -103,7 +103,7 @@ class BrowserTreePane(private val services: BrowserServices) : JPanel() {
     private inner class BrowserRootNode : BrowserTreeNode("Class file", NodeType.NO_CONTENT) {
         fun add(nodeType: NodeType, node: BrowserTreeNode) {
             add(node)
-            categoryToPath.put(nodeType, TreePath(arrayOf<Any>(this, node)))
+            categoryToPath[nodeType] = TreePath(arrayOf<Any>(this, node))
         }
     }
 
@@ -112,7 +112,7 @@ class BrowserTreePane(private val services: BrowserServices) : JPanel() {
         return BrowserTreeNode("Constant Pool", NodeType.CONSTANT_POOL, constantPool).apply {
             constantPool.forEachIndexed { i, constant ->
                 if (i > 0) {
-                    add(if (constant is ConstantPlaceholder) {
+                    add(if (constant == ConstantPlaceholder) {
                         BrowserTreeNode(getFormattedIndex(i, constantPool.size) + "(large numeric continued)", NodeType.NO_CONTENT, constant)
                     } else {
                         try {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/DetailPane.kt

@@ -82,6 +82,6 @@ abstract class DetailPane<out T : Any>(private val elementClass: Class<T>, val s
     }
 
     companion object {
-        val CPINFO_LINK_TEXT = "cp_info #"
+        const val CPINFO_LINK_TEXT = "cp_info #"
     }
 }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/FrameContent.kt

@@ -231,16 +231,16 @@ class FrameContent(val frame: BrowserFrame) : JPanel() {
     }
 
     companion object {
-        val CARD_EMPTY = "empty"
-        val CARD_TABBED_PANE = "tabbedPane"
+        const val CARD_EMPTY = "empty"
+        const val CARD_TABBED_PANE = "tabbedPane"
         val PREFERRED_SIZE = Dimension(100, 100)
         val EMPTY_BACKGROUND = Color(210, 210, 210)
-        val TABBED_PANE_EMPTY_MESSAGE = "Drag class files to this area"
+        const val TABBED_PANE_EMPTY_MESSAGE = "Drag class files to this area"
 
-        private val NODE_NAME_TABS = "tabs"
-        private val ATTRIBUTE_SPLIT_MODE = "splitMode"
-        private val NODE_NAME_GROUP = "group"
-        private val ATTRIBUTE_POSITION = "position"
+        private const val NODE_NAME_TABS = "tabs"
+        private const val ATTRIBUTE_SPLIT_MODE = "splitMode"
+        private const val NODE_NAME_GROUP = "group"
+        private const val ATTRIBUTE_POSITION = "position"
     }
 }
 

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/Main.kt

@@ -20,10 +20,10 @@ import java.io.PrintStream
 import java.util.*
 import javax.swing.UIManager
 
-val applicationTitle = "Bytecode viewer"
-val lafDefaultSystemProperty = "jclasslib.laf.default"
-val workspaceFileSuffix = "jcw"
-val webSiteUrl = "http://www.ej-technologies.com/products/jclasslib/overview.html"
+const val applicationTitle = "Bytecode viewer"
+const val lafDefaultSystemProperty = "jclasslib.laf.default"
+const val workspaceFileSuffix = "jcw"
+const val webSiteUrl = "http://www.ej-technologies.com/products/jclasslib/overview.html"
 
 fun main(args: Array<String>) {
 

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/RecentMenu.kt

@@ -57,7 +57,7 @@ class RecentMenu(private val frame: BrowserFrame) : JMenu() {
             recentNode.keys().forEach { key ->
                 val fileName = recentNode.get(key, null)
                 if (fileName != null) {
-                    numberToFile.put(Integer.parseInt(key), fileName)
+                    numberToFile[Integer.parseInt(key)] = fileName
                 }
             }
             recentWorkspaces.addAll(numberToFile.values)
@@ -119,7 +119,7 @@ class RecentMenu(private val frame: BrowserFrame) : JMenu() {
     }
 
     companion object {
-        private val RECENT_PROJECTS_MAX_SIZE = 10
-        private val SETTINGS_RECENT_WORKSPACES = "recentWorkspaces"
+        private const val RECENT_PROJECTS_MAX_SIZE = 10
+        private const val SETTINGS_RECENT_WORKSPACES = "recentWorkspaces"
     }
 }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/BrowserConfig.kt

@@ -126,8 +126,8 @@ class BrowserConfig : ClasspathComponent {
     }
 
     companion object {
-        private val ATTRIBUTE_JRE_HOME = "jreHome"
-        private val NODE_NAME_CLASSPATH = "classpath"
+        private const val ATTRIBUTE_JRE_HOME = "jreHome"
+        private const val NODE_NAME_CLASSPATH = "classpath"
     }
 
 }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/BrowserPath.kt

@@ -32,7 +32,7 @@ class BrowserPath {
     }
 
     companion object {
-        val NODE_NAME = "path"
+        const val NODE_NAME = "path"
 
         fun create(element: Element): BrowserPath? {
             return element.firstChildElement(NODE_NAME)?.let { pathElement ->
@@ -75,8 +75,8 @@ data class CategoryHolder(val category: NodeType = NodeType.NO_CONTENT) : PathCo
     override fun matches(node: BrowserTreeNode) = node.type == category
 
     companion object {
-        val NODE_NAME = "category"
-        private val ATTRIBUTE_NAME = "name"
+        const val NODE_NAME = "category"
+        private const val ATTRIBUTE_NAME = "name"
 
         fun create(element: Element): CategoryHolder? {
             val nodeType = NodeType.getByName(element.getAttribute(ATTRIBUTE_NAME))
@@ -95,8 +95,8 @@ data class IndexHolder(val index: Int = -1) : PathComponent {
     override fun matches(node: BrowserTreeNode) = node.index == index
 
     companion object {
-        val NODE_NAME = "element"
-        private val ATTRIBUTE_INDEX = "index"
+        const val NODE_NAME = "element"
+        private const val ATTRIBUTE_INDEX = "index"
 
         fun create(element: Element) = IndexHolder(element.getAttribute(ATTRIBUTE_INDEX).toInt())
     }
@@ -115,9 +115,9 @@ data class ReferenceHolder(val name: String = "", val type: String = "") : PathC
     }
 
     companion object {
-        val NODE_NAME = "reference"
-        private val ATTRIBUTE_NAME = "name"
-        private val ATTRIBUTE_TYPE = "type"
+        const val NODE_NAME = "reference"
+        private const val ATTRIBUTE_NAME = "name"
+        private const val ATTRIBUTE_TYPE = "type"
 
         fun create(element: Element) = ReferenceHolder(element.getAttribute(ATTRIBUTE_NAME), element.getAttribute(ATTRIBUTE_TYPE))
     }
@@ -133,8 +133,8 @@ data class AttributeHolder(val name: String) : PathComponent {
     override fun matches(node: BrowserTreeNode) = (node.element as AttributeInfo).name == name
 
     companion object {
-        val NODE_NAME = "attribute"
-        private val ATTRIBUTE_NAME = "name"
+        const val NODE_NAME = "attribute"
+        private const val ATTRIBUTE_NAME = "name"
 
         fun create(element: Element) = AttributeHolder(element.getAttribute(ATTRIBUTE_NAME))
     }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/classpath/ClasspathArchiveEntry.kt

@@ -61,8 +61,8 @@ class ClasspathArchiveEntry(fileName : String) : ClasspathEntry(fileName) {
     }
 
     companion object {
-        val NODE_NAME = "archive"
-        private val ATTRIBUTE_PATH = "path"
+        const val NODE_NAME = "archive"
+        private const val ATTRIBUTE_PATH = "path"
 
         fun create(element: Element) = ClasspathArchiveEntry(element.getAttribute(ATTRIBUTE_PATH))
     }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/classpath/ClasspathDirectoryEntry.kt

@@ -77,8 +77,8 @@ class ClasspathDirectoryEntry(fileName: String) : ClasspathEntry(fileName) {
     }
 
     companion object {
-        val NODE_NAME = "directory"
-        private val ATTRIBUTE_PATH = "path"
+        const val NODE_NAME = "directory"
+        private const val ATTRIBUTE_PATH = "path"
 
         fun create(element: Element) = ClasspathDirectoryEntry(element.getAttribute(ATTRIBUTE_PATH))
     }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/classpath/ClasspathEntry.kt

@@ -122,9 +122,9 @@ abstract class ClasspathEntry(fileName : String) : ClasspathComponent {
     }
 
     companion object {
-        val CLASSFILE_SUFFIX = ".class"
-        val UNNAMED_MODULE = "<unnamed module>"
-        val MODULE_INFO_CLASS_FILE_NAME = "module-info.class"
+        const val CLASSFILE_SUFFIX = ".class"
+        const val UNNAMED_MODULE = "<unnamed module>"
+        const val MODULE_INFO_CLASS_FILE_NAME = "module-info.class"
 
         fun create(element : Element) : ClasspathEntry? = when (element.nodeName) {
             ClasspathDirectoryEntry.NODE_NAME -> ClasspathDirectoryEntry.create(element)

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/config/classpath/ClasspathJrtEntry.kt

@@ -33,6 +33,6 @@ class ClasspathJrtEntry(jreHome: String) : ClasspathEntry(jreHome) {
     }
 
     companion object {
-        val JRT_PREFIX = "jrt:"
+        const val JRT_PREFIX = "jrt:"
     }
 }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/ConstantPoolDetailPane.kt

@@ -23,7 +23,7 @@ class ConstantPoolDetailPane(services: BrowserServices) : DetailPane<Array<Const
     val filterPane = object : FilterPane<ConstantType, Constant>(this@ConstantPoolDetailPane) {
         override fun getAllFilterKeys() = ConstantType.values().toList()
         override fun isElementTextFiltered(element: Constant, filterText: String) = element is AbstractConstant && (isShowAll || element.verbose.contains(filterText))
-        override fun getFilterKeys(element: Constant) = if (element is ConstantPlaceholder) setOf() else setOf(element.constantType)
+        override fun getFilterKeys(element: Constant) = if (element == ConstantPlaceholder) setOf() else setOf(element.constantType)
     }
 
     override fun show(treePath: TreePath) {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/ConstantPoolEntryDetailPane.kt

@@ -46,7 +46,7 @@ class ConstantPoolEntryDetailPane(services: BrowserServices) : DetailPane<Consta
 
     override fun show(treePath: TreePath) {
         val constant = getElement(treePath)
-        if (constant is ConstantPlaceholder) {
+        if (constant == ConstantPlaceholder) {
             showCard(NAME_UNKNOWN)
         } else {
             val constantType = constant.constantType
@@ -64,15 +64,15 @@ class ConstantPoolEntryDetailPane(services: BrowserServices) : DetailPane<Consta
 
     private fun addCard(detailPane: ConstantDetailPane<*>, constantType: ConstantType) {
         add(detailPane.displayComponent, constantType.name)
-        constantTypeToDetailPane.put(constantType, detailPane)
+        constantTypeToDetailPane[constantType] = detailPane
     }
 
     private fun showCard(name: String) {
         (layout as CardLayout).show(this, name)
     }
 
     companion object {
-        private val NAME_UNKNOWN = "ConstantUnknown"
+        private const val NAME_UNKNOWN = "ConstantUnknown"
     }
 
 }

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/FilterPane.kt

@@ -82,7 +82,7 @@ abstract class FilterPane<out T, in S : Structure>(private val detailPane: Detai
 
         }
 
-    open protected fun addComponents() {
+    protected open fun addComponents() {
         add(filterComponent(JLabel("Text filter:")), "split, $RADIO_BUTTON_INSET")
         add(filterComponent(filterTextField))
         add(filterComponent(JButton("Clear").apply {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/KeyValueDetailPane.kt

@@ -145,7 +145,7 @@ abstract class KeyValueDetailPane<T : Any>(elementClass: Class<T>, services: Bro
     private fun ExtendedJLabel.setupMouseListener(mouseListener: MouseListener) {
         labelToMouseListener[this]?.let { removeMouseListener(it) }
         addMouseListener(mouseListener)
-        labelToMouseListener.put(this, mouseListener)
+        labelToMouseListener[this] = mouseListener
     }
 
     private fun ExtendedJLabel.applyComment(constantPoolIndex: Int) {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/MultiDetailPane.kt

@@ -76,11 +76,11 @@ abstract class MultiDetailPane<T : Structure>(elementClass: Class<T>, services:
 
     protected fun addCard(elementValueClass: Class<out T>, detailPane: DetailPane<*>) {
         specificInfoPane.add(detailPane.displayComponent, elementValueClass.name)
-        elementClassToDetailPane.put(elementValueClass, detailPane)
+        elementClassToDetailPane[elementValueClass] = detailPane
     }
 
     companion object {
-        private val NAME_UNKNOWN = "Unknown"
+        private const val NAME_UNKNOWN = "Unknown"
     }
 }
 

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/TableDetailPane.kt

@@ -106,10 +106,10 @@ abstract class TableDetailPane<T : AttributeInfo>(elementClass: Class<T>, servic
                 createTableModel(attribute)
             }
 
-    open protected val autoResizeMode: Int
+    protected open val autoResizeMode: Int
         get() = JTable.AUTO_RESIZE_OFF
 
-    open protected val isVariableRowHeight: Boolean
+    protected open val isVariableRowHeight: Boolean
         get() = false
 
     override fun setupComponent() {
@@ -151,7 +151,7 @@ abstract class TableDetailPane<T : AttributeInfo>(elementClass: Class<T>, servic
         }
     }
 
-    open protected val rowHeightFactor: Float
+    protected open val rowHeightFactor: Float
         get() = 1f
 
     fun selectIndex(index: Int) {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/ColumnTableModel.kt

@@ -16,7 +16,7 @@ abstract class ColumnTableModel<T : Any>(private val rows: Array<T>) : AbstractT
         buildColumns(this)
     }
 
-    open protected fun buildColumns(columns: ArrayList<Column<T>>) {
+    protected open fun buildColumns(columns: ArrayList<Column<T>>) {
         columns.add(object : NumberColumn<T>("Nr.") {
             override fun createValue(row: T) = rows.indexOf(row)
             override val maxWidth: Int

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/Columns.kt

@@ -65,7 +65,7 @@ abstract class NamedConstantPoolLinkColumn<in T : Any>(name: String, services: B
         return LinkWithComment(DetailPane.CPINFO_LINK_TEXT + constantPoolIndex, getComment(constantPoolIndex))
     }
 
-    open protected fun getComment(constantPoolIndex: Int) = getConstantPoolEntryName(constantPoolIndex)
+    protected open fun getComment(constantPoolIndex: Int) = getConstantPoolEntryName(constantPoolIndex)
 
     private fun getConstantPoolEntryName(constantPoolIndex: Int): String {
         return try {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/LocalVariableAttributeDetailPane.kt

@@ -19,7 +19,7 @@ abstract class LocalVariableAttributeDetailPane(services: BrowserServices) : Tab
     override val rowHeightFactor: Float
         get() = 2f
 
-    abstract protected val descriptorOrSignatureVerbose: String
+    protected abstract val descriptorOrSignatureVerbose: String
 
     protected inner class AttributeTableModel(rows: Array<LocalVariableEntry>) : ColumnTableModel<LocalVariableEntry>(rows) {
 

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/code/ByteCodeDocument.kt

@@ -83,7 +83,7 @@ class ByteCodeDocument(styles: StyleContext, private val attribute: CodeAttribut
     }
 
     private fun addOffsetReference(offset: Int) {
-        offsetToPosition.put(offset, length)
+        offsetToPosition[offset] = length
     }
 
     private fun addOpcodeSpecificInfo(instruction: Instruction): Int =

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/document/AttributeDocument.kt

@@ -138,11 +138,11 @@ abstract class AttributeDocument(protected val styles: StyleContext, protected v
     }
 
     companion object {
-        val ATTRIBUTE_NAME_LINK = "attributeLink"
-        val ATTRIBUTE_NAME_HOVER_HIGHLIGHT = "hoverHighlight"
+        const val ATTRIBUTE_NAME_LINK = "attributeLink"
+        const val ATTRIBUTE_NAME_HOVER_HIGHLIGHT = "hoverHighlight"
 
         val DOTTED_STROKE = BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0.toFloat(), floatArrayOf(3.toFloat(), 4.toFloat()), 0.0f)
-        val TAB = "    "
+        const val TAB = "    "
 
         val STYLE_NORMAL = style()
         val STYLE_SMALL = style {

modules/browser/src/main/kotlin/org/gjt/jclasslib/browser/detail/attributes/document/DocumentDetailPane.kt

@@ -109,7 +109,7 @@ abstract class DocumentDetailPane<T : AttributeInfo, out D: AttributeDocument>(e
         })
     }
 
-    open protected fun makeVisible() {
+    protected open fun makeVisible() {
 
     }
 
@@ -236,7 +236,7 @@ abstract class DocumentDetailPane<T : AttributeInfo, out D: AttributeDocument>(e
         }
     }
 
-    protected inner open class AttributeTextPane : JTextPane() {
+    protected open inner class AttributeTextPane : JTextPane() {
         var preventDrag: Boolean = false
 
         init {
@@ -293,7 +293,7 @@ abstract class DocumentDetailPane<T : AttributeInfo, out D: AttributeDocument>(e
 
     companion object {
         private val origin = Rectangle(0, 0, 0, 0)
-        private val LINE_NUMBERS_OFFSET = 9
+        private const val LINE_NUMBERS_OFFSET = 9
 
         private data class FontInfo(val family: String, val style: Int, val size: Int)
         private val styles = object : StyleContext() {