Add dependency working.

Layoric · Layoric · commit 020aff91f30b · 2015-04-06T12:16:17.000+10:00
`build.gradle` updated and user prompted to sync.
diff --git a/src/ServiceStackIDEA/.idea/vcs.xml b/src/ServiceStackIDEA/.idea/vcs.xml
diff --git a/src/ServiceStackIDEA/.idea/workspace.xml b/src/ServiceStackIDEA/.idea/workspace.xml
diff --git a/src/ServiceStackIDEA/META-INF/plugin.xml b/src/ServiceStackIDEA/META-INF/plugin.xml
@@ -37,7 +37,7 @@
   </project-components>
 
   <actions>
-    <action id="AddServiceStackReference" class="AddServiceStackReference" text="Add ServiceStack Reference..." icon="/icons/logo-16.png"
+    <action id="AddServiceStackReference" class="AddServiceStackReference" text="ServiceStack Reference..." icon="/icons/logo-16.png"
             description="Adds a ServiceStack reference to the selected module">
       <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewAction"/>
       <keyboard-shortcut keymap="$default" first-keystroke="shift ctrl alt R"/>
diff --git a/src/ServiceStackIDEA/src/AddRef.form b/src/ServiceStackIDEA/src/AddRef.form
@@ -6,8 +6,10 @@
       <xy x="48" y="54" width="650" height="350"/>
     </constraints>
     <properties>
+      <maximumSize width="550" height="220"/>
       <minimumSize width="400" height="220"/>
-      <preferredSize width="400" height="220"/>
+      <opaque value="true"/>
+      <preferredSize width="550" height="220"/>
       <requestFocusEnabled value="true"/>
     </properties>
     <border type="none"/>
@@ -63,34 +65,39 @@
         </properties>
         <border type="none"/>
         <children>
-          <component id="1b633" class="javax.swing.JTextPane" binding="messageTextPane">
+          <component id="e88c4" class="javax.swing.JTextPane" binding="errorTextPane">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="50"/>
               </grid>
             </constraints>
             <properties>
-              <background color="-1118482"/>
-              <disabledTextColor color="-16777216"/>
               <editable value="false"/>
-              <enabled value="false"/>
+              <focusCycleRoot value="false"/>
               <focusable value="false"/>
-              <text value="To generate the DTO Service Model types for a specific ServiceStack instance, enter the base URI for the remote ServiceStack server and click OK."/>
+              <opaque value="false"/>
+              <visible value="false"/>
             </properties>
           </component>
-          <component id="e88c4" class="javax.swing.JTextPane" binding="errorTextPane">
+          <component id="bc9e3" class="javax.swing.JTextPane" binding="infoTextPane">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="50"/>
               </grid>
             </constraints>
             <properties>
-              <visible value="false"/>
+              <editable value="false"/>
+              <focusCycleRoot value="false"/>
+              <focusable value="false"/>
+              <font name="Arial"/>
+              <opaque value="false"/>
+              <requestFocusEnabled value="false"/>
+              <text value="To generate the DTO Service Model types for a specific ServiceStack instance, enter the base URI for the remote ServiceStack server and click OK."/>
             </properties>
           </component>
         </children>
       </grid>
-      <grid id="d865d" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="d865d" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -133,6 +140,25 @@
             </constraints>
             <properties/>
           </component>
+          <component id="885b4" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="eec01"/>
+              <text value="Name"/>
+            </properties>
+          </component>
+          <component id="eec01" class="javax.swing.JTextField" binding="nameTextField">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <text value="dto.java"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/src/ServiceStackIDEA/src/AddRef.java b/src/ServiceStackIDEA/src/AddRef.java
@@ -1,9 +1,14 @@
 import com.google.gson.Gson;
 import com.intellij.ide.util.PackageChooserDialog;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -19,17 +24,22 @@ public class AddRef extends JDialog {
     private JPanel contentPane;
     private JButton buttonOK;
     private JButton buttonCancel;
-    private JTextPane messageTextPane;
     private JTextPane errorTextPane;
     private JTextField addressUrlTextField;
     private TextFieldWithBrowseButton packageBrowse;
+    private JTextField nameTextField;
+    private JTextPane infoTextPane;
     private Module module;
 
     public AddRef(@Nullable Module module) {
         this.module = module;
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
+        ImageIcon imageIcon = createImageIcon("/icons/logo-16.png","ServiceStack");
+        if(imageIcon != null) {
+            this.setIconImage(imageIcon.getImage());
+        }
 
         buttonOK.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -65,10 +75,20 @@ public void actionPerformed(ActionEvent e) {
         }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
     }
 
+    private ImageIcon createImageIcon(String path, String description) {
+        java.net.URL imgURL = getClass().getResource(path);
+        if (imgURL != null) {
+            return new ImageIcon(imgURL, description);
+        } else {
+            System.err.println("Couldn't find file: " + path);
+            return null;
+        }
+    }
 
     private void onOK() throws IOException {
         GradleBuildFileHelper gradleBuildFileHelper = new GradleBuildFileHelper(this.module);
-        gradleBuildFileHelper.addJsonServiceClientDependency();
+        gradleBuildFileHelper.addDependency("com.google.code.gson", "gson", "2.3.1");
+        refreshBuildFile();
         String url = createUrl(addressUrlTextField.getText());
         String typeMetadataUrl = createUrl(addressUrlTextField.getText()).replace("types/java/", "types/metadata/?format=json");
         URL metadataUrl = new URL(typeMetadataUrl);
@@ -97,6 +117,17 @@ private void onOK() throws IOException {
         dispose();
     }
 
+    private void refreshBuildFile() {
+        VirtualFileManager.getInstance().syncRefresh();
+        VirtualFile fileByUrl = VirtualFileManager.getInstance().findFileByUrl(module.getModuleFile().getParent().getUrl() + "/build.gradle");
+
+        FileEditorManager.getInstance(module.getProject()).openFile(fileByUrl,false);
+        Document document = FileEditorManager.getInstance(module.getProject()).getSelectedTextEditor().getDocument();
+
+        FileDocumentManager.getInstance().reloadFromDisk(document);
+        VirtualFileManager.getInstance().syncRefresh();
+    }
+
     private static class BrowsePackageListener implements ActionListener {
         private TextFieldWithBrowseButton _textField;
         private Project _project;
diff --git a/src/ServiceStackIDEA/src/AddServiceStackReference.java b/src/ServiceStackIDEA/src/AddServiceStackReference.java
@@ -1,3 +1,4 @@
+import com.intellij.facet.Facet;
 import com.intellij.facet.FacetManager;
 import com.intellij.facet.FacetTypeId;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -9,6 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.Objects;
 
 public class AddServiceStackReference extends AnAction {
     public static final FacetTypeId ID = new FacetTypeId("android");
@@ -22,17 +24,18 @@ public void actionPerformed(AnActionEvent e) {
         dialog.pack();
         dialog.setLocationRelativeTo(null);
         dialog.setSize(dialog.getPreferredSize());
+        dialog.setResizable(false);
         dialog.setVisible(true);
     }
 
     @Override
     public void update(AnActionEvent e) {
         Module m = getModule(e);
-//        if (m == null || !isAndroidProject(m)) {
-//            e.getPresentation().setEnabled(false);
-//            return;
-//        }
-//        e.getPresentation().setEnabled(false);
+        if (m == null || !isAndroidProject(m)) {
+            e.getPresentation().setEnabled(false);
+            return;
+        }
+        e.getPresentation().setEnabled(true);
         super.update(e);
     }
 
@@ -47,8 +50,13 @@ static Module getModule(Project project) {
     }
 
     private static boolean isAndroidProject(@NotNull Module module) {
-        Collection facetsByType = FacetManager.getInstance(module).getFacetsByType(ID);
-        return facetsByType.size() > 0;
+        Facet[] facetsByType = FacetManager.getInstance(module).getAllFacets();
+        for (Facet facet :facetsByType) {
+            if(Objects.equals(facet.getTypeId().toString(), "android")) {
+                return true;
+            }
+        }
+        return false;
     }
 
     static Module getModule(AnActionEvent e) {
diff --git a/src/ServiceStackIDEA/src/GradleBuildFileHelper.java b/src/ServiceStackIDEA/src/GradleBuildFileHelper.java
@@ -18,7 +18,7 @@ public GradleBuildFileHelper(Module module) {
         this.module = module;
     }
 
-    public void addJsonServiceClientDependency() {
+    public void addDependency(String groupId, String packageName, String version) {
         VirtualFile moduleFile = module.getModuleFile();
         if(moduleFile == null) {
             return;
@@ -28,7 +28,7 @@ public void addJsonServiceClientDependency() {
         File[] matchingFiles = file.listFiles(new FilenameFilter() {
             @Override
             public boolean accept(File dir, String name) {
-                return name.startsWith("gradle.build");
+                return name.startsWith("build.gradle");
             }
         });
         if(matchingFiles == null || matchingFiles.length == 0) {
@@ -62,7 +62,20 @@ public boolean accept(File dir, String name) {
             return;
         }
 
-        list.add(dependenciesEndIndex - 1, "compile: 'net.servicestack:client:0.1'");
+        boolean dependencyRequired = true;
+        //Check if groupId + package already listed as dependency
+        for (int i = dependenciesStartIndex; i < dependenciesEndIndex; i++) {
+            String dependencyLoC = list.get(i);
+            if(dependencyLoC.contains(groupId + ":" + packageName)) {
+                dependencyRequired = false;
+                break;
+            }
+        }
+
+        if(!dependencyRequired) {
+            return;
+        }
+        list.add(dependenciesEndIndex, "    compile '" + groupId + ":" + packageName + ":" + version + "'");
         try {
             PrintWriter writer = new PrintWriter(gradleFile);
             for(String item : list) {
