Set project language to 6 and remove 7+ specifics.

Built ServiceStackIDEA with 1.6 to avoid problems with default OSX install of IntelliJ

Author: Layoric

src/ServiceStackIDEA/.idea/workspace.xml

@@ -9,7 +9,7 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      1.0.4 - Bug fixes for Maven project support and new versions of net.servicestack:client
+      1.0.4 - Bug fixes for Maven project support and new versions of net.servicestack:client.<br />
       1.0.3 - Added support to detect Maven pom.xml and inject net.servicestack:client dependency for IntelliJ + Maven modules.<br />
       1.0.2 - Fix plugin.xml template bug to enable search from IDE.<br>
       1.0 - Initial release.<br />

src/ServiceStackIDEA/META-INF/plugin.xml

@@ -42,7 +42,7 @@ public class AddServiceStackRefHandler {
 
     public static void handleOk(String addressUrl, String qualifiedPackageName, String fileName, String selectedDirectory, Module module, StringBuilder errorMessage) {
         String url;
-        List<String> javaCodeLines = new ArrayList<>();
+        List<String> javaCodeLines = new ArrayList<String>();
         try {
             URIBuilder urlBuilder = createUrl(addressUrl);
             urlBuilder.addParameter("Package", qualifiedPackageName);
@@ -68,7 +68,11 @@ public static void handleOk(String addressUrl, String qualifiedPackageName, Stri
                 return;
             }
 
-        } catch (URISyntaxException | MalformedURLException e) {
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
+            return;
+        } catch (MalformedURLException e) {
             e.printStackTrace();
             errorMessage.append(e.getClass().getName()).append(" - Invalid ServiceStack endpoint provided - ").append(addressUrl);
             return;
@@ -80,15 +84,28 @@ public static void handleOk(String addressUrl, String qualifiedPackageName, Stri
 
 
         GradleBuildFileHelper gradleBuildFileHelper = new GradleBuildFileHelper(module);
-        boolean showDto;
+        boolean showDto = true;
         final MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(module.getProject());
 
         boolean isMavenModule = mavenProjectsManager != null && mavenProjectsManager.isMavenizedModule(module);
         if(isMavenModule) {
             showDto = tryAddMavenDependency(module);
         } else {
             //Gradle
-            showDto = addGradleDependencyIfRequired(module,gradleBuildFileHelper);
+            try {
+                showDto = addGradleDependencyIfRequired(module,gradleBuildFileHelper);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                String message = "Failed to update build.gradle with '" +
+                        dependencyGroupId + ":" + clientPackageId + ":" + dependencyVersion +
+                        "'. " + e.getLocalizedMessage();
+                Notification notification = new Notification(
+                        "ServiceStackIDEA",
+                        "Warning Add ServiceStack Reference",
+                        message,
+                        NotificationType.WARNING);
+                Notifications.Bus.notify(notification);
+            }
         }
 
         String dtoPath;
@@ -131,7 +148,7 @@ private static boolean tryAddMavenDependency(Module module) {
         return showDto;
     }
 
-    private static boolean addGradleDependencyIfRequired(Module module, GradleBuildFileHelper gradleBuildFileHelper) {
+    private static boolean addGradleDependencyIfRequired(Module module, GradleBuildFileHelper gradleBuildFileHelper) throws FileNotFoundException {
         boolean result = true;
         if(gradleBuildFileHelper.addDependency(dependencyGroupId, dependencyPackageId, dependencyVersion)) {
             result = false;

src/ServiceStackIDEA/ServiceStackIDEA.zip

@@ -58,7 +58,7 @@ public void actionPerformed(AnActionEvent e) {
                     PsiDirectory selectedDir = (PsiDirectory) element;
                     String packageName = "";
                     String moduleDirectoryPath = module.getModuleFile().getParent().getPath();
-                    List<String> packageArray = new ArrayList<>();
+                    List<String> packageArray = new ArrayList<String>();
                     while (selectedDir != null && !(Objects.equals(moduleDirectoryPath, selectedDir.getVirtualFile().getPath()))) {
                         packageArray.add(selectedDir.getName());
                         selectedDir = selectedDir.getParent();

src/ServiceStackIDEA/src/net/servicestack/idea/AddServiceStackRefHandler.java

@@ -19,7 +19,7 @@ public GradleBuildFileHelper(Module module) {
         this.module = module;
     }
 
-    public boolean addDependency(String groupId, String packageName, String version) {
+    public boolean addDependency(String groupId, String packageName, String version) throws FileNotFoundException {
         VirtualFile moduleFile = module.getModuleFile();
         if(moduleFile == null) {
             return false;
@@ -39,8 +39,9 @@ public boolean accept(File dir, String name) {
         File gradleFile = matchingFiles[0];
         Integer dependenciesStartIndex = -1;
         Integer dependenciesEndIndex = -1;
-        List<String> list = new ArrayList<>();
-        try (BufferedReader br = new BufferedReader(new FileReader(gradleFile))) {
+        List<String> list = new ArrayList<String>();
+        BufferedReader br = new BufferedReader(new FileReader(gradleFile));
+        try {
             int count = 0;
             for(String line; (line = br.readLine()) != null; ) {
                 list.add(line);

src/ServiceStackIDEA/src/net/servicestack/idea/AddServiceStackReference.java

@@ -47,7 +47,10 @@ public boolean addMavenDependencyIfRequired(File pomFile, String groupId, String
                 noDependencyAdded = false;
             }
 
-        } catch (IOException | XmlPullParserException e) {
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("Unable to process pom.xml to add " + groupId + ":" + packageId + ":" + version);
+        } catch (XmlPullParserException e) {
             e.printStackTrace();
             throw new Exception("Unable to process pom.xml to add " + groupId + ":" + packageId + ":" + version);
         }

src/ServiceStackIDEA/src/net/servicestack/idea/GradleBuildFileHelper.java

@@ -28,7 +28,7 @@ public class UpdateServiceStackUtils {
     public static void updateServiceStackReference(PsiFile psiFile) {
         String code = psiFile.getText();
         Scanner scanner = new Scanner(code);
-        List<String> linesOfCode = new ArrayList<>();
+        List<String> linesOfCode = new ArrayList<String>();
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();
             linesOfCode.add(line);