Skip to content

Commit a401daf

Browse files
committed
Refactor UI components and simplify method implementations
Replaced legacy Swing components with IntelliJ’s UI components for better integration. Removed unused `resetToDefaults` method and updated type usage in `SentryErrorReporter` for clarity. These changes enhance maintainability and consistency across the codebase.
1 parent a551863 commit a401daf

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

src/main/kotlin/dev/meanmail/prettifypython/diagnostic/SentryErrorReporter.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@ class SentryErrorReporter : ErrorReportSubmitter() {
8383
"IDE company url" to applicationInfo.companyURL,
8484
"IDE api version" to applicationInfo.apiVersion
8585
)
86-
event.setExtras(
87-
mapOf(
88-
"Additional info" to additionalInfo,
89-
"Event date" to ideaEvent.data.date
90-
)
86+
event.extras = mapOf(
87+
"Additional info" to additionalInfo,
88+
"Event date" to ideaEvent.data.date
9189
)
9290
SentryClient.captureEvent(event)
9391
}

src/main/kotlin/dev/meanmail/prettifypython/settings/PrettifySettings.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ class PrettifySettings : PersistentStateComponent<PrettifySettings.State> {
4747
return DEFAULT_MAPPINGS
4848
}
4949

50-
fun resetToDefaults() {
51-
myState.mappings = getDefaultMappings()
52-
myState.categories = myState.mappings.map { it.category }.toSet()
53-
}
54-
5550
companion object {
5651
fun getInstance(): PrettifySettings =
5752
ApplicationManager.getApplication().getService(PrettifySettings::class.java)

src/main/kotlin/dev/meanmail/prettifypython/settings/PrettifySettingsComponent.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,19 @@ import com.intellij.openapi.actionSystem.AnAction
77
import com.intellij.openapi.actionSystem.AnActionEvent
88
import com.intellij.openapi.application.ApplicationInfo
99
import com.intellij.openapi.extensions.PluginId
10+
import com.intellij.openapi.ui.ComboBox
1011
import com.intellij.openapi.ui.DialogWrapper
1112
import com.intellij.openapi.ui.Messages
1213
import com.intellij.ui.IdeBorderFactory
1314
import com.intellij.ui.ToolbarDecorator
1415
import com.intellij.ui.treeStructure.Tree
16+
import com.intellij.util.ui.JBUI
1517
import kotlinx.serialization.encodeToString
1618
import kotlinx.serialization.json.Json
17-
import java.awt.*
19+
import java.awt.BorderLayout
20+
import java.awt.Component
21+
import java.awt.GridBagConstraints
22+
import java.awt.GridBagLayout
1823
import java.awt.datatransfer.DataFlavor
1924
import java.awt.datatransfer.Transferable
2025
import java.awt.datatransfer.UnsupportedFlavorException
@@ -160,7 +165,7 @@ class PrettifySettingsComponent {
160165
}
161166

162167
private inner class MappingTransferHandler(private val tree: JTree) : TransferHandler() {
163-
override fun getSourceActions(c: JComponent): Int = TransferHandler.MOVE
168+
override fun getSourceActions(c: JComponent): Int = MOVE
164169

165170
override fun createTransferable(component: JComponent): Transferable? {
166171
val node = tree.selectionPath?.lastPathComponent as? DefaultMutableTreeNode ?: return null
@@ -378,8 +383,8 @@ private class MappingTreeCellRenderer : DefaultTreeCellRenderer() {
378383
private class MappingDialog(
379384
parent: Component,
380385
title: String,
381-
private val mapping: MappingEntry? = null,
382-
private val existingCategories: List<String>
386+
mapping: MappingEntry? = null,
387+
existingCategories: List<String>
383388
) : DialogWrapper(parent, true) {
384389
private val categoryField: JComboBox<String>
385390
private val fromField: JTextField
@@ -389,7 +394,7 @@ private class MappingDialog(
389394
init {
390395
this.title = title
391396

392-
categoryField = JComboBox(existingCategories.toTypedArray())
397+
categoryField = ComboBox(existingCategories.toTypedArray())
393398
categoryField.isEditable = true
394399
fromField = JTextField()
395400
toField = JTextField()
@@ -404,7 +409,7 @@ private class MappingDialog(
404409
val constraints = GridBagConstraints()
405410
constraints.fill = GridBagConstraints.HORIZONTAL
406411
constraints.weightx = 1.0
407-
constraints.insets = Insets(5, 5, 5, 5)
412+
constraints.insets = JBUI.insets(5)
408413

409414
constraints.gridx = 0
410415
constraints.gridy = 0

0 commit comments

Comments
 (0)