idea maintenance (to support 2019.3)

plugins/idea/.gitignore

@@ -3,4 +3,5 @@
 /src/main/resources/robovm-dist
 /.idea/
 /build/
-org.robovm.idea.iml
+org.robovm.idea.iml
+/.gradle/

plugins/idea/README.md

@@ -13,13 +13,16 @@ Not supported any more due removed `-extdir` in Java9+
 * Install this plugin, it allows us to use Maven for plugin development https://plugins.jetbrains.com/plugin/7127?pr=
 * Clone this repo https://github.com/JetBrains/intellij-community.git
 * Checkout the branch that corresponds to the respective IDEA version you installed, e.g. 139 for Idea 14.0.x, see http://www.jetbrains.org/pages/viewpage.action?pageId=983225
-* Open Intellij IDEA CE, setup the IDEA sdk pointing it at your IDEA installation. Also add following JARs to SDK from IDEA directory:
+* Open Intellij IDEA CE, setup the IDEA sdk pointing it at your IDEA installation. Add source path to root of repo cloned above. Also add following JARs to SDK from IDEA directory:
    - /Applications/IntelliJ IDEA CE.app/Contents/plugins/maven/lib/maven.jar
    - /Applications/IntelliJ IDEA CE.app/Contents/plugins/gradle/lib/gradle-common.jar
-   - /Applications/IntelliJ IDEA CE.app/Contents/plugins/gradle/lib/gradle-java.jar
+   - (pre 2019.3) /Applications/IntelliJ IDEA CE.app/Contents/plugins/gradle/lib/gradle-java.jar
+   - (after 2019.3) /Applications/IntelliJ IDEA CE.app/Contents/plugins/gradle-java/lib/gradle-java.jar!/
 * Open the project by selecting it's POM
 * Open File -> Project Structure, Click on the Project menu entry, and select the IDEA sdk under Project SDK
 * Click OK
+
+* Run `dependency:copy` goal in `RoboVM plugin for Intellij IDEA/Plugins/dependency` to get `src/main/resources/robovm-dist` resolved
 * Optionally import the robovm-compiler, robovm-debugger, robovm-ibxcode projects as modules. IDEA will resolve the dependencies to those modules so you can debug and code hotswap the compiler and debugger!
 * Create a new run configuration, using the Plugin run config type. Set the module. Happy coding.
 

plugins/idea/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "0.4.12"
+    id "org.jetbrains.intellij" version "0.4.15"
 }
 
 ext {

plugins/idea/src/main/java/org/robovm/idea/RoboVmIcons.java

@@ -17,13 +17,15 @@
 package org.robovm.idea;
 
 import com.intellij.openapi.util.IconLoader;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import java.util.Objects;
 
 /**
  * preloads icons used by various components
  */
 public class RoboVmIcons {
-    public static final Icon ROBOVM_SMALL = IconLoader.findIcon("/icons/robovm_small.png");
-    public static final Icon ROBOVM_LARGE = IconLoader.findIcon("/icons/robovm_large.png");
+    public static final @NotNull Icon ROBOVM_SMALL = Objects.requireNonNull(IconLoader.findIcon("/icons/robovm_small.png"));
+    public static final @NotNull Icon ROBOVM_LARGE = Objects.requireNonNull(IconLoader.findIcon("/icons/robovm_large.png"));
 }

plugins/idea/src/main/java/org/robovm/idea/actions/ASNewProjectAction.java

@@ -19,8 +19,8 @@
 import com.intellij.ide.projectWizard.NewProjectWizard;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * action to overcome idea studio limitation in creating new project
@@ -35,8 +35,8 @@ public boolean startInTransaction() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent e) {
-        NewProjectWizard wizard = new NewProjectWizard((Project)null, ModulesProvider.EMPTY_MODULES_PROVIDER, (String)null);
-        NewProjectUtil.createNewProject(getEventProject(e), wizard);
+    public void actionPerformed(@NotNull AnActionEvent e) {
+        NewProjectWizard wizard = new NewProjectWizard(null, ModulesProvider.EMPTY_MODULES_PROVIDER, null);
+        NewProjectUtil.createNewProject(null, wizard); // have to use outdated as replacement was introduced only in 2019.3
     }
 }

plugins/idea/src/main/java/org/robovm/idea/actions/CleanBuildFoldersAction.java

@@ -25,6 +25,7 @@
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.NotNull;
 import org.robovm.compiler.target.ios.IOSTarget;
@@ -40,9 +41,9 @@ public class CleanBuildFoldersAction extends AnAction {
     private static AtomicBoolean busy = new AtomicBoolean(false);
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent) {
+    public void actionPerformed(@NotNull AnActionEvent e) {
         if (!busy.get()) {
-            ProgressManager.getInstance().run(new CleanTask(anActionEvent.getProject()));
+            ProgressManager.getInstance().run(new CleanTask(e.getProject()));
         }
     }
 
@@ -73,12 +74,14 @@ public void run(@NotNull ProgressIndicator progress) {
                     File moduleBaseDir = RoboVmPlugin.getModuleBaseDir(module);
                     File robovmBuildDir = new File(moduleBaseDir, "robovm-build");
                     FileUtils.deleteDirectory(robovmBuildDir);
+
+                    //Refresh the module folder, so that we see, it has happened
+                    VirtualFile moduleFile = module.getModuleFile();
+                    if (moduleFile != null)
+                        moduleFile.getParent().refresh(false, true);
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);
-            } finally {
-                //Refresh the module folder, so that we see, it has happened
-                project.getBaseDir().refresh(false, true);
             }
         }
 
@@ -94,7 +97,7 @@ public void onFinished() {
 
             // single exit point
             if (exceptionIfHappened != null) {
-                Notifications.Bus.notify(new Notification("RoboVM", "RoboVM Cache Build Folder Clearer",
+                Notifications.Bus.notify(new Notification("RoboVM", "RoboVM cache build folder clearer",
                         "Failed due error: " + exceptionIfHappened.getMessage(), NotificationType.ERROR));
             }
 

plugins/idea/src/main/java/org/robovm/idea/actions/CleanRoboVmCacheAction.java

@@ -66,13 +66,13 @@ public void run(@NotNull ProgressIndicator progress) {
             File file = new File(System.getProperty("user.home"), ".robovm/cache");
             try {
                 FileUtils.deleteDirectory(file);
-            } catch (IOException e) {
+            } catch (IOException ignored) {
             }
         }
 
         @Override
-        public void onError(@NotNull Exception error) {
-            super.onError(error);
+        public void onThrowable(@NotNull Throwable error) {
+            super.onThrowable(error);
             exceptionIfHappened = error;
         }
 
@@ -82,7 +82,7 @@ public void onFinished() {
 
             // single exit point
             if (exceptionIfHappened != null) {
-                Notifications.Bus.notify(new Notification( "RoboVM", "RoboVM Cache Clearer",
+                Notifications.Bus.notify(new Notification( "RoboVM", "RoboVM cache clearer",
                         "Failed due error: " + exceptionIfHappened.getMessage(), NotificationType.ERROR));
             }
 

plugins/idea/src/main/java/org/robovm/idea/actions/CreateFrameworkAction.java

@@ -17,12 +17,12 @@
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileScope;
-import com.intellij.openapi.compiler.CompileStatusNotification;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Key;
 import org.robovm.idea.RoboVmPlugin;
 
@@ -32,19 +32,22 @@ public class CreateFrameworkAction extends AnAction {
     public static final Key<FrameworkConfig> FRAMEWORK_CONFIG_KEY = Key.create("FRAMEWORK_CONFIG");
 
     public void actionPerformed(final AnActionEvent e) {
-        final CreateFrameworkDialog dialog = new CreateFrameworkDialog(e.getProject());
+        Project project = e.getProject();
+        if (project == null) {
+            RoboVmPlugin.logBalloon(null, MessageType.ERROR, "Oops. Project is missing.");
+            return;
+        }
+
+        final CreateFrameworkDialog dialog = new CreateFrameworkDialog(project);
         dialog.show();
-        if(dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
             // create Framework
             FrameworkConfig frameworkConfig = dialog.getFrameworkConfig();
-            CompileScope scope = CompilerManager.getInstance(e.getProject()).createModuleCompileScope(frameworkConfig.module, true);
+            CompileScope scope = CompilerManager.getInstance(project).createModuleCompileScope(frameworkConfig.module, true);
             scope.putUserData(FRAMEWORK_CONFIG_KEY, frameworkConfig);
-            CompilerManager.getInstance(e.getProject()).compile(scope, new CompileStatusNotification() {
-                @Override
-                public void finished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
-                    RoboVmPlugin.logInfo(e.getProject(), "Framework creation complete, %d errors, %d warnings", errors, warnings);
-                }
-            });
+            CompilerManager.getInstance(project).compile(scope, (aborted, errors, warnings, compileContext) ->
+                    RoboVmPlugin.logInfo(project, "Framework creation complete, %d errors, %d warnings", errors, warnings)
+            );
         }
     }
 

plugins/idea/src/main/java/org/robovm/idea/actions/CreateIpaAction.java

@@ -18,38 +18,39 @@
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileScope;
-import com.intellij.openapi.compiler.CompileStatusNotification;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Key;
-import org.jetbrains.annotations.Nullable;
 import org.robovm.compiler.config.Arch;
 import org.robovm.idea.RoboVmPlugin;
 
-import javax.swing.*;
 import java.io.File;
 import java.util.List;
 
 public class CreateIpaAction extends AnAction {
     public static final Key<IpaConfig> IPA_CONFIG_KEY = Key.create("IPA_CONFIG");
 
     public void actionPerformed(final AnActionEvent e) {
+        Project project = e.getProject();
+        if (project == null) {
+            RoboVmPlugin.logBalloon(null, MessageType.ERROR, "Oops. Project is missing.");
+            return;
+        }
+
         final CreateIpaDialog dialog = new CreateIpaDialog(e.getProject());
         dialog.show();
-        if(dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
             // create IPA
             IpaConfig ipaConfig = dialog.getIpaConfig();
-            CompileScope scope = CompilerManager.getInstance(e.getProject()).createModuleCompileScope(ipaConfig.module, true);
+            CompileScope scope = CompilerManager.getInstance(project).createModuleCompileScope(ipaConfig.module, true);
             scope.putUserData(IPA_CONFIG_KEY, ipaConfig);
-            CompilerManager.getInstance(e.getProject()).compile(scope, new CompileStatusNotification() {
-                @Override
-                public void finished(boolean aborted, int errors, int warnings, CompileContext compileContext) {
-                    RoboVmPlugin.logInfo(e.getProject(), "IPA creation complete, %d errors, %d warnings", errors, warnings);
-                }
-            });
+            CompilerManager.getInstance(project).compile(scope, (aborted, errors, warnings, compileContext) ->
+                    RoboVmPlugin.logInfo(project, "IPA creation complete, %d errors, %d warnings", errors, warnings)
+            );
         }
     }
 

plugins/idea/src/main/java/org/robovm/idea/actions/CreateIpaDialog.java

@@ -17,7 +17,6 @@
 package org.robovm.idea.actions;
 
 import com.intellij.ide.util.PropertiesComponent;
-import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDialog;
 import com.intellij.openapi.fileChooser.FileChooserFactory;
@@ -29,19 +28,16 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nullable;
 import org.robovm.compiler.config.Arch;
-import org.robovm.compiler.target.ios.DeviceType;
 import org.robovm.compiler.target.ios.IOSTarget;
 import org.robovm.compiler.target.ios.ProvisioningProfile;
 import org.robovm.compiler.target.ios.SigningIdentity;
 import org.robovm.idea.RoboVmPlugin;
-import org.robovm.idea.running.RoboVmRunConfiguration;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class CreateIpaDialog extends DialogWrapper {
     private static final String MODULE_NAME = "robovm.ipaConfig.moduleName";
@@ -54,12 +50,12 @@ public class CreateIpaDialog extends DialogWrapper {
     private static final String ARCHS_32BIT = "32-bit (thumbv7)";
     private static final String ARCHS_64BIT = "64-bit (arm64)";
     private JPanel panel;
-    private JComboBox archs;
-    private JComboBox signingIdentity;
-    private JComboBox provisioningProfile;
+    private JComboBox<String> archs;
+    private JComboBox<String> signingIdentity;
+    private JComboBox<String> provisioningProfile;
     private JButton browseButton;
     private JTextField destinationDir;
-    private JComboBox module;
+    private JComboBox<String> module;
     private Project project;
 
     protected CreateIpaDialog(@Nullable Project project) {
@@ -104,7 +100,7 @@ private void populateControls() {
         // populate architectures
         for(String arch: new String[] { ARCHS_ALL, ARCHS_32BIT, ARCHS_64BIT }) {
             archs.addItem(arch);
-            if(arch.equals(configProvisioning)) {
+            if(arch.equals(configArchs)) {
                 this.archs.setSelectedIndex(this.archs.getItemCount()-1);
             }
         }
@@ -113,25 +109,22 @@ private void populateControls() {
             destinationDir.setText(configDestDir);
         }
 
-        browseButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                FileChooserDialog fileChooser = FileChooserFactory.getInstance()
-                        .createFileChooser(new FileChooserDescriptor(true, false, false, false, false, false) {
-                            @Override
-                            public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
-                                return file.isDirectory();
-                            }
-
-                            @Override
-                            public boolean isFileSelectable(VirtualFile file) {
-                                return file.isDirectory();
-                            }
-                        }, null, panel);
-                VirtualFile[] dir = fileChooser.choose(project);
-                if (dir != null && dir.length > 0) {
-                    destinationDir.setText(dir[0].getCanonicalPath());
-                }
+        browseButton.addActionListener(e -> {
+            FileChooserDialog fileChooser = FileChooserFactory.getInstance()
+                    .createFileChooser(new FileChooserDescriptor(true, false, false, false, false, false) {
+                        @Override
+                        public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
+                            return file.isDirectory();
+                        }
+
+                        @Override
+                        public boolean isFileSelectable(VirtualFile file) {
+                            return file.isDirectory();
+                        }
+                    }, null, panel);
+            VirtualFile[] dir = fileChooser.choose(project);
+            if (dir.length > 0) {
+                destinationDir.setText(dir[0].getCanonicalPath());
             }
         });
     }
@@ -169,27 +162,32 @@ protected ValidationInfo doValidate() {
 
     public CreateIpaAction.IpaConfig getIpaConfig() {
         saveProperties();
-        Module module = ModuleManager.getInstance(project).findModuleByName(this.module.getSelectedItem().toString());
-        String signingIdentity = this.signingIdentity.getSelectedItem().toString();
-        String provisioningProile = this.provisioningProfile.getSelectedItem().toString();
-        List<Arch> archs = new ArrayList<Arch>();
-        if(this.archs.getSelectedItem().toString().equals(ARCHS_ALL)) {
-            archs.add(Arch.thumbv7);
-            archs.add(Arch.arm64);
-        } else if(this.archs.getSelectedItem().toString().equals(ARCHS_32BIT)) {
-            archs.add(Arch.thumbv7);
-        } else if(this.archs.getSelectedItem().toString().equals(ARCHS_64BIT)) {
-            archs.add(Arch.arm64);
+        Module module = ModuleManager.getInstance(project).findModuleByName((String) Objects.requireNonNull(this.module.getSelectedItem()));
+        String signingIdentity = (String) Objects.requireNonNull(this.signingIdentity.getSelectedItem());
+        String provisioningProile = (String) Objects.requireNonNull(this.provisioningProfile.getSelectedItem());
+        String arch = (String) Objects.requireNonNull(this.archs.getSelectedItem());
+        List<Arch> archs = new ArrayList<>();
+        switch (arch) {
+            case ARCHS_ALL:
+                archs.add(Arch.thumbv7);
+                archs.add(Arch.arm64);
+                break;
+            case ARCHS_32BIT:
+                archs.add(Arch.thumbv7);
+                break;
+            case ARCHS_64BIT:
+                archs.add(Arch.arm64);
+                break;
         }
         return new CreateIpaAction.IpaConfig(module, new File(this.destinationDir.getText()), signingIdentity, provisioningProile, archs);
     }
 
     private void saveProperties() {
         PropertiesComponent properties = PropertiesComponent.getInstance(project);
-        properties.setValue(MODULE_NAME, module.getSelectedItem().toString());
-        properties.setValue(SIGNING_IDENTITY, signingIdentity.getSelectedItem().toString());
-        properties.setValue(PROVISIONING_PROFILE, provisioningProfile.getSelectedItem().toString());
-        properties.setValue(ARCHS, archs.getSelectedItem().toString());
+        properties.setValue(MODULE_NAME, (String)module.getSelectedItem());
+        properties.setValue(SIGNING_IDENTITY, (String)signingIdentity.getSelectedItem());
+        properties.setValue(PROVISIONING_PROFILE, (String)provisioningProfile.getSelectedItem());
+        properties.setValue(ARCHS, (String)archs.getSelectedItem());
         properties.setValue(DESTINATION_DIR, destinationDir.getText());
     }
 }