Update for api change and stop using adaptors that will be deprecated

build.gradle

@@ -11,7 +11,7 @@ targetCompatibility = "1.8"
 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
 intellij {
-    version "14"
+    version "15.0.4"
     pluginName 'MiniMap'
     updateSinceUntilBuild = false
 }

src/main/java/net/vektah/codeglance/EditorPanelInjector.kt

@@ -4,7 +4,8 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.fileEditor.FileEditorManagerAdapter
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent
+import com.intellij.openapi.fileEditor.FileEditorManagerListener
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
@@ -19,7 +20,7 @@ import javax.swing.JPanel
 /**
  * Injects a panel into any newly created editors.
  */
-class EditorPanelInjector(private val project: Project) : FileEditorManagerAdapter() {
+class EditorPanelInjector(private val project: Project) : FileEditorManagerListener {
     private val logger = Logger.getInstance(javaClass)
     private var config: Config = ServiceManager.getService(ConfigService::class.java).state!!
 
@@ -84,4 +85,10 @@ class EditorPanelInjector(private val project: Project) : FileEditorManagerAdapt
             Disposer.register(editor, Disposable { panel.remove(glancePanel) })
         }
     }
+
+
+    override fun selectionChanged(event: FileEditorManagerEvent) {}
+
+    override fun fileClosed(source: FileEditorManager, file: VirtualFile) {}
+
 }

src/main/java/net/vektah/codeglance/GlancePanel.kt

@@ -30,9 +30,9 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.editor.FoldRegion
 import com.intellij.openapi.editor.colors.ColorKey
-import com.intellij.openapi.editor.event.DocumentAdapter
 import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
+import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.editor.event.SelectionListener
 import com.intellij.openapi.editor.event.VisibleAreaListener
 import com.intellij.openapi.editor.ex.EditorEx
@@ -45,7 +45,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.PersistentFSConstants
 import com.intellij.ui.JBColor
-import com.intellij.util.ui.UIUtil
 import net.vektah.codeglance.concurrent.DirtyLock
 import net.vektah.codeglance.config.Config
 import net.vektah.codeglance.config.ConfigService
@@ -81,7 +80,7 @@ class GlancePanel(private val project: Project, textEditor: TextEditor) : JPanel
     private val componentListener: ComponentListener
     private val documentListener: DocumentListener
     private val areaListener: VisibleAreaListener
-    private val selectionListener: SelectionListener = SelectionListener { repaint() }
+    private val selectionListener: SelectionListener
 
     private val updateTask: ReadTask
 
@@ -105,8 +104,10 @@ class GlancePanel(private val project: Project, textEditor: TextEditor) : JPanel
         }
         editor.contentComponent.addComponentListener(componentListener)
 
-        documentListener = object : DocumentAdapter() {
-            override fun documentChanged(documentEvent: DocumentEvent?) = updateImage()
+        documentListener = object : DocumentListener {
+            override fun beforeDocumentChange(event: DocumentEvent) {}
+
+            override fun documentChanged(event: DocumentEvent) = updateImage()
         }
         editor.document.addDocumentListener(documentListener)
 
@@ -123,9 +124,12 @@ class GlancePanel(private val project: Project, textEditor: TextEditor) : JPanel
         }
         editor.scrollingModel.addVisibleAreaListener(areaListener)
 
+        selectionListener = object : SelectionListener {
+            override fun selectionChanged(e: SelectionEvent) = repaint()
+        }
         editor.selectionModel.addSelectionListener(selectionListener)
 
-        updateTask = object : ReadTask {
+        updateTask = object : ReadTask() {
             override fun onCanceled(indicator: ProgressIndicator) = updateImage()
 
             override fun computeInReadAction(indicator: ProgressIndicator) {
@@ -266,7 +270,8 @@ class GlancePanel(private val project: Project, textEditor: TextEditor) : JPanel
         }
 
         if (buf == null || buf?.width!! < width || buf?.height!! < height) {
-            buf = UIUtil.createImage(width, height, BufferedImage.TYPE_4BYTE_ABGR)
+            // TODO: Add handling for HiDPI scaling and switch back to UIUtil.createImage
+            buf = BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR)
         }
 
         val g = buf!!.createGraphics()

src/main/java/net/vektah/codeglance/render/Minimap.kt

@@ -28,7 +28,6 @@ package net.vektah.codeglance.render
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.progress.ProgressIndicator
-import com.intellij.util.ui.UIUtil
 import net.vektah.codeglance.config.Config
 import java.awt.AlphaComposite
 import java.awt.image.BufferedImage
@@ -44,7 +43,6 @@ class Minimap(private val config: Config) {
      * Internal worker function to update the minimap image
      *
      * @param editor        The editor being drawn
-     * @param hl            The syntax highlighter to use for the language this document is in.
      */
     fun update(editor: EditorEx, scrollstate: ScrollState, indicator: ProgressIndicator?) {
         logger.debug("Updating file image.")
@@ -53,7 +51,8 @@ class Minimap(private val config: Config) {
             if (img != null) img!!.flush()
             // Create an image that is a bit bigger then the one we need so we don't need to re-create it again soon.
             // Documents can get big, so rather then relative sizes lets just add a fixed amount on.
-            img = UIUtil.createImage(config.width, scrollstate.documentHeight + (100 * config.pixelsPerLine), BufferedImage.TYPE_4BYTE_ABGR)
+            // TODO: Add handling for HiDPI scaling and switch back to UIUtil.createImage
+            img = BufferedImage(config.width, scrollstate.documentHeight + (100 * config.pixelsPerLine), BufferedImage.TYPE_4BYTE_ABGR)
             logger.debug("Created new image")
         }
 

src/main/resources/META-INF/plugin.xml

@@ -150,7 +150,8 @@
 		</ul>
 	]]></change-notes>
 
-	<idea-version since-build="139" until-build="143.*"/>
+	<!--Earlier versions of 143 had broken kotlin modules...-->
+	<idea-version since-build="143.2287.1"/>
 
 	<depends>com.intellij.modules.platform</depends>