Cleanup (layout)

plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompiler.kt

@@ -16,6 +16,7 @@
 package org.jetbrains.java.decompiler
 
 import com.intellij.execution.filters.LineNumbersMapping
+import com.intellij.icons.AllIcons
 import com.intellij.ide.highlighter.JavaFileType
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.util.PropertiesComponent
@@ -28,6 +29,7 @@ import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.DefaultProjectFactory
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.registry.Registry
@@ -40,17 +42,26 @@ import com.intellij.psi.PsiPackage
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import com.intellij.psi.compiled.ClassFileDecompilers
 import com.intellij.psi.impl.compiled.ClsFileImpl
+import com.intellij.ui.Gray
+import com.intellij.ui.components.JBLabel
+import com.intellij.ui.components.JBPanel
 import com.intellij.util.containers.ContainerUtil
+import com.intellij.util.ui.JBUI
+import com.intellij.util.ui.UIUtil
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler
 import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences
 import org.jetbrains.java.decompiler.main.extern.IResultSaver
+import java.awt.BorderLayout
 import java.io.File
 import java.util.*
 import java.util.concurrent.Callable
 import java.util.concurrent.Future
 import java.util.jar.Manifest
+import javax.swing.BorderFactory
+import javax.swing.JComponent
+import javax.swing.JEditorPane
 
 class IdeaDecompiler : ClassFileDecompilers.Light() {
   companion object {
@@ -239,4 +250,44 @@ class IdeaDecompiler : ClassFileDecompilers.Light() {
       return -1
     }
   }
+
+  private class LegalNoticeDialog(project: Project, file: VirtualFile) : DialogWrapper(project) {
+    companion object {
+      val POSTPONE_EXIT_CODE = DialogWrapper.CANCEL_EXIT_CODE
+      val DECLINE_EXIT_CODE = DialogWrapper.NEXT_USER_EXIT_CODE
+    }
+
+    private var myMessage: JEditorPane? = null
+
+    init {
+      title = IdeaDecompilerBundle.message("legal.notice.title", StringUtil.last(file.path, 40, true))
+      setOKButtonText(IdeaDecompilerBundle.message("legal.notice.action.accept"))
+      setCancelButtonText(IdeaDecompilerBundle.message("legal.notice.action.postpone"))
+      init()
+      pack()
+    }
+
+    override fun createCenterPanel(): JComponent? {
+      val iconPanel = JBPanel<JBPanel<*>>(BorderLayout())
+      iconPanel.add(JBLabel(AllIcons.General.WarningDialog), BorderLayout.NORTH)
+
+      val message = JEditorPane()
+      myMessage = message
+      message.editorKit = UIUtil.getHTMLEditorKit()
+      message.isEditable = false
+      message.preferredSize = JBUI.size(500, 100)
+      message.border = BorderFactory.createLineBorder(Gray._200)
+      message.text = "<div style='margin:5px;'>${IdeaDecompilerBundle.message("legal.notice.text")}</div>"
+
+      val panel = JBPanel<JBPanel<*>>(BorderLayout(JBUI.scale(10), 0))
+      panel.add(iconPanel, BorderLayout.WEST)
+      panel.add(message, BorderLayout.CENTER)
+      return panel
+    }
+
+    override fun createActions() =
+        arrayOf(okAction, DialogWrapperExitAction(IdeaDecompilerBundle.message("legal.notice.action.reject"), DECLINE_EXIT_CODE), cancelAction)
+
+    override fun getPreferredFocusedComponent() = myMessage
+  }
 }

plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/LegalNoticeDialog.java

@@ -1,89 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.Gray;
-import com.intellij.ui.components.JBLabel;
-import com.intellij.ui.components.JBPanel;
-import com.intellij.util.ui.JBUI;
-import com.intellij.util.ui.UIUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-
-class LegalNoticeDialog extends DialogWrapper {
-  public static final int POSTPONE_EXIT_CODE = CANCEL_EXIT_CODE;
-  public static final int DECLINE_EXIT_CODE = NEXT_USER_EXIT_CODE;
-
-  private JEditorPane myMessage;
-
-  public LegalNoticeDialog(Project project, VirtualFile file) {
-    super(project);
-    setTitle(IdeaDecompilerBundle.message("legal.notice.title", StringUtil.last(file.getPath(), 40, true)));
-    setOKButtonText(IdeaDecompilerBundle.message("legal.notice.action.accept"));
-    setCancelButtonText(IdeaDecompilerBundle.message("legal.notice.action.postpone"));
-    init();
-    pack();
-  }
-
-  @Nullable
-  @Override
-  protected JComponent createCenterPanel() {
-    JPanel iconPanel = new JBPanel(new BorderLayout());
-    iconPanel.add(new JBLabel(AllIcons.General.WarningDialog), BorderLayout.NORTH);
-
-    myMessage = new JEditorPane();
-    myMessage.setEditorKit(UIUtil.getHTMLEditorKit());
-    myMessage.setEditable(false);
-    myMessage.setPreferredSize(JBUI.size(500, 100));
-    myMessage.setBorder(BorderFactory.createLineBorder(Gray._200));
-    String text = "<div style='margin:5px;'>" + IdeaDecompilerBundle.message("legal.notice.text") + "</div>";
-    myMessage.setText(text);
-
-    JPanel panel = new JBPanel(new BorderLayout(10, 0));
-    panel.add(iconPanel, BorderLayout.WEST);
-    panel.add(myMessage, BorderLayout.CENTER);
-    return panel;
-  }
-
-  @NotNull
-  @Override
-  protected Action[] createActions() {
-    return new Action[]{
-      getOKAction(),
-      new DialogWrapperAction(IdeaDecompilerBundle.message("legal.notice.action.reject")) {
-        @Override
-        protected void doAction(ActionEvent e) {
-          close(DECLINE_EXIT_CODE);
-        }
-      },
-      getCancelAction()};
-  }
-
-  @Nullable
-  @Override
-  public JComponent getPreferredFocusedComponent() {
-    return myMessage;
-  }
-}