Code clean up.

net.servicestack:android/client look like they need to be updated. Build errors around IReturn and response status.

Author: Layoric

src/ServiceStackIDEA/.idea/workspace.xml

@@ -42,7 +42,7 @@ The Java file will then be added to the related package or `/src/main/java` fold
 
 #### Update ServiceStack Reference
 
-Once you have added a ServiceStack reference, it can be easily updated by using AndroidStudio `Intension` shortcut, usually Alt+Enter when in the file.
+Once you have added a ServiceStack reference, it can be easily updated by using AndroidStudio `Intention` shortcut, usually Alt+Enter when in the file.
 
 ![](https://github.com/ServiceStack/Assets/raw/master/img/servicestackidea/android-update-example.gif)
 

src/ServiceStackIDEA/README.MD

@@ -1,29 +1,22 @@
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.intellij.ide.util.PackageChooserDialog;
 import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl;
-import com.intellij.openapi.vfs.newvfs.impl.VirtualFileImpl;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiPackage;
-import com.intellij.psi.impl.file.PsiDirectoryImpl;
-import com.intellij.psi.util.ClassUtil;
 import com.intellij.ui.JBColor;
-import com.sun.javafx.fxml.builder.URLBuilder;
 import org.apache.http.client.utils.URIBuilder;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -248,7 +241,7 @@ private void onOK() {
         try {
             URIBuilder urlBuilder = createUrl(addressUrlTextField.getText());
             urlBuilder.addParameter("Package", packageBrowse.getText());
-            String name = getDtoNameWithoutExtention().replaceAll("\\.", "_");
+            String name = getDtpNameWithoutExtension().replaceAll("\\.", "_");
             urlBuilder.addParameter("GlobalNamespace", name);
             url = urlBuilder.build().toString();
 
@@ -344,6 +337,10 @@ private String getDtoPath() throws FileNotFoundException {
                 throw new FileNotFoundException();
             }
             PsiDirectory rootPackageDir = PsiManager.getInstance(module.getProject()).findDirectory(selectedFolder);
+            if(rootPackageDir == null) {
+                errorMessage = "Unable to determine path for DTO file.";
+                throw new FileNotFoundException();
+            }
             fullDtoPath = rootPackageDir.getVirtualFile().getPath() + "/" + getDtoFileName();
         } else {
             String moduleSourcePath;
@@ -359,10 +356,16 @@ private String getDtoPath() throws FileNotFoundException {
 
     private void refreshBuildFile() {
         VirtualFileManager.getInstance().syncRefresh();
+        if(module.getModuleFile() == null) { return; }
+
         VirtualFile fileByUrl = VirtualFileManager.getInstance().findFileByUrl(module.getModuleFile().getParent().getUrl() + "/build.gradle");
 
+        if(fileByUrl == null) { return; }
+
         FileEditorManager.getInstance(module.getProject()).openFile(fileByUrl, false);
-        Document document = FileEditorManager.getInstance(module.getProject()).getSelectedTextEditor().getDocument();
+        Editor currentEditor = FileEditorManager.getInstance(module.getProject()).getSelectedTextEditor();
+        if(currentEditor == null) { return; }
+        Document document = currentEditor.getDocument();
 
         FileDocumentManager.getInstance().reloadFromDisk(document);
         VirtualFileManager.getInstance().syncRefresh();
@@ -378,7 +381,9 @@ private void refreshFile(String filePath, boolean openFile) {
         }
 
         FileEditorManager.getInstance(module.getProject()).openFile(fileByUrl, false);
-        Document document = FileEditorManager.getInstance(module.getProject()).getSelectedTextEditor().getDocument();
+        Editor currentEditor = FileEditorManager.getInstance(module.getProject()).getSelectedTextEditor();
+        if(currentEditor == null) { return; }
+        Document document = currentEditor.getDocument();
 
         if (!openFile) FileEditorManager.getInstance(module.getProject()).closeFile(fileByUrl);
 
@@ -444,7 +449,7 @@ private String getDtoFileName() {
         }
     }
 
-    private String getDtoNameWithoutExtention() {
+    private String getDtpNameWithoutExtension() {
         String name = nameTextField.getText();
         int p = name.lastIndexOf(".");
         String e = name.substring(p + 1);
@@ -461,11 +466,4 @@ private void onCancel() {
 // add your code here if necessary
         dispose();
     }
-
-    public static void main(String[] args) {
-        AddRef dialog = new AddRef(null);
-        dialog.pack();
-        dialog.setVisible(true);
-        System.exit(0);
-    }
 }

src/ServiceStackIDEA/ServiceStackIDEA.zip

@@ -1,8 +1,6 @@
 import com.google.common.collect.Lists;
 import com.intellij.facet.Facet;
 import com.intellij.facet.FacetManager;
-import com.intellij.ide.util.DirectoryUtil;
-import com.intellij.ide.util.PackageUtil;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
@@ -14,13 +12,8 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.PackageChooser;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.PackageEntry;
-import com.intellij.psi.impl.file.PsiJavaDirectoryImpl;
-import com.intellij.psi.search.PackageScope;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -30,8 +23,6 @@
 public class AddServiceStackReference extends AnAction {
 
     public void actionPerformed(AnActionEvent e) {
-
-        // TODO: insert action logic here
         Module module = getModule(e);
         AddRef dialog = new AddRef(module);
         dialog.pack();
@@ -42,41 +33,39 @@ public void actionPerformed(AnActionEvent e) {
 
         //Check if a package was selected in the left hand menu, populate package name
         PsiElement element = DataKeys.PSI_ELEMENT.getData(e.getDataContext());
-        if (element != null && element instanceof PsiPackage){
-            PsiPackage psiPackage = (PsiPackage)element;
+        if (element != null && element instanceof PsiPackage) {
+            PsiPackage psiPackage = (PsiPackage) element;
             dialog.setSelectedPackage(psiPackage);
             dialog.setVisible(true);
             return;
         }
 
         //Check if a directory containing a Java file was selected, populate package name
-        if (element != null && element instanceof PsiDirectory){
+        if (element != null && element instanceof PsiDirectory) {
             PsiElement firstChild = element.getFirstChild();
             dialog.setSelectedDirectory(((PsiDirectory) element).getVirtualFile().getPath());
-            if(firstChild != null && firstChild instanceof PsiJavaFile) {
-                PsiJavaFile firstJavaFile = (PsiJavaFile)firstChild;
+            if (firstChild != null && firstChild instanceof PsiJavaFile) {
+                PsiJavaFile firstJavaFile = (PsiJavaFile) firstChild;
                 PsiPackage mainPackage = JavaPsiFacade.getInstance(module.getProject()).findPackage(firstJavaFile.getPackageName());
-                if(mainPackage != null) {
+                if (mainPackage != null) {
                     dialog.setSelectedPackage(mainPackage);
                 }
-            } else {
+            } else if(module.getModuleFile() != null) {
                 try {
-                    PsiDirectory selectedDir = (PsiDirectory)element;
+                    PsiDirectory selectedDir = (PsiDirectory) element;
                     String packageName = "";
                     String moduleDirectoryName = module.getModuleFile().getParent().getName();
                     List<String> packageArray = new ArrayList<>();
-                    while(selectedDir != null && !(Objects.equals(selectedDir.getName(), moduleDirectoryName))) {
+                    while (selectedDir != null && !(Objects.equals(selectedDir.getName(), moduleDirectoryName))) {
                         packageArray.add(selectedDir.getName());
                         selectedDir = selectedDir.getParent();
                         PsiPackage mainPackage = testPackage(module, packageName, packageArray);
-                        if(mainPackage != null) {
+                        if (mainPackage != null) {
                             dialog.setSelectedPackage(mainPackage);
                             break;
                         }
                     }
-
-
-                }catch (Exception ex) {
+                } catch (Exception ex) {
                     //do nothing, can't get package name.
                 }
             }
@@ -86,41 +75,40 @@ public void actionPerformed(AnActionEvent e) {
 
         //Check if a Java file was selected, display without a package name if no file.
         VirtualFile selectedFile = DataKeys.VIRTUAL_FILE.getData(e.getDataContext());
-        if(selectedFile == null) {
+        if (selectedFile == null) {
             Notification notification = new Notification("ServiceStackIDEA", "Error Add ServiceStack Reference", "Context menu failed find folder or file.", NotificationType.ERROR);
             Notifications.Bus.notify(notification);
             return;
         }
-        if(selectedFile.isDirectory()) {
+        if (selectedFile.isDirectory()) {
             dialog.setSelectedDirectory(selectedFile.getPath());
-        } else if(selectedFile.getParent().isDirectory()) {
+        } else if (selectedFile.getParent().isDirectory()) {
             dialog.setSelectedDirectory(selectedFile.getParent().getPath());
         } else {
             Notification notification = new Notification("ServiceStackIDEA", "Error Add ServiceStack Reference", "Context menu failed find folder or file.", NotificationType.ERROR);
             Notifications.Bus.notify(notification);
             return;
         }
 
-
         //Check for document, display without a package name if no document.
         Document document = FileDocumentManager.getInstance().getDocument(selectedFile);
-        if(document == null) {
+        if (document == null) {
             dialog.setVisible(true);
             return;
         }
 
         //Check if a 'PsiFile', display without a package name if no PsiFile.
         PsiFile psiFile = PsiDocumentManager.getInstance(module.getProject()).getPsiFile(document);
-        if(psiFile == null) {
+        if (psiFile == null) {
             dialog.setVisible(true);
             return;
         }
 
         //Finally check if a Java file and populate package name with class package name.
-        if(Objects.equals(psiFile.getFileType().getName(), "JAVA")) {
-            PsiJavaFile javaFile = (PsiJavaFile)psiFile;
+        if (Objects.equals(psiFile.getFileType().getName(), "JAVA")) {
+            PsiJavaFile javaFile = (PsiJavaFile) psiFile;
             PsiPackage mainPackage = JavaPsiFacade.getInstance(module.getProject()).findPackage(javaFile.getPackageName());
-            if(mainPackage != null) {
+            if (mainPackage != null) {
                 dialog.setSelectedPackage(mainPackage);
             }
         }
@@ -130,8 +118,8 @@ public void actionPerformed(AnActionEvent e) {
 
     private PsiPackage testPackage(Module module, String packageName, List<String> packageArray) {
         List<String> packageNameOrderedList = Lists.reverse(packageArray);
-        for(int i = 0; i < packageNameOrderedList.size(); i++) {
-            if(i < packageNameOrderedList.size() - 1) {
+        for (int i = 0; i < packageNameOrderedList.size(); i++) {
+            if (i < packageNameOrderedList.size() - 1) {
                 packageName += packageNameOrderedList.get(i) + ".";
             } else {
                 packageName += packageNameOrderedList.get(i);
@@ -163,8 +151,8 @@ static Module getModule(Project project) {
 
     private static boolean isAndroidProject(@NotNull Module module) {
         Facet[] facetsByType = FacetManager.getInstance(module).getAllFacets();
-        for (Facet facet :facetsByType) {
-            if(Objects.equals(facet.getTypeId().toString(), "android")) {
+        for (Facet facet : facetsByType) {
+            if (Objects.equals(facet.getTypeId().toString(), "android")) {
                 return true;
             }
         }

src/ServiceStackIDEA/src/AddRef.java

@@ -1,6 +1,4 @@
-import com.google.common.base.Joiner;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import java.io.*;
@@ -9,6 +7,7 @@
 
 /**
  * Created by Layoric on 2/04/2015.
+ * Methods to help insert gradle dependency
  */
 public class GradleBuildFileHelper {
 

src/ServiceStackIDEA/src/AddServiceStackReference.java

@@ -4,7 +4,6 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataKeys;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.module.Module;
@@ -21,6 +20,7 @@
 
 /**
  * Created by Layoric on 9/04/2015.
+ * Update ServiceStack Reference Project menu context action
  */
 public class UpdateServiceStackReference extends AnAction {