Merge remote-tracking branch 'refs/remotes/origin/master' into webstorm-typescript

# Conflicts:
#	src/ServiceStackIDEA/src/main/resources/META-INF/plugin.xml

Author: Layoric

src/ServiceStackIDEA/.idea/misc.xml

@@ -73,7 +73,7 @@ public static void handleOk(String addressUrl, String qualifiedPackageName,
         if (!writeDtoFile(javaCodeLines, dtoPath, errorMessage)) {
             return;
         }
-
+        Analytics.SubmitAnonymousAddReferenceUsage(getNativeTypesHandler(fileName));
         IDEAUtils.refreshFile(module, dtoPath, showDto);
         VirtualFileManager.getInstance().syncRefresh();
     }

src/ServiceStackIDEA/.idea/workspace.xml

@@ -0,0 +1,43 @@
+package net.servicestack.idea;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * Helper to submit anonymous add reference usage.
+ */
+public final class Analytics {
+
+    private final static String addRefUrl = "https://servicestack.net/stats/addref/record?Name=";
+
+    public static void SubmitAnonymousAddReferenceUsage(INativeTypesHandler typesHandler) {
+        PluginSettingsService settings = PluginSettingsService.getInstance();
+        if(!settings.optOutOfStats) {
+            final String url = addRefUrl + typesHandler.getTypesLanguage().name();
+            final URL[] serviceUrl = {null};
+            final URLConnection[] responseConnection = {null};
+            final BufferedReader[] responseReader = {null};
+            Thread thread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        serviceUrl[0] = new URL(url);
+                        responseConnection[0] = serviceUrl[0].openConnection();
+                        responseReader[0] = new BufferedReader(
+                                new InputStreamReader(
+                                        responseConnection[0].getInputStream()));
+
+                        responseReader[0].close();
+                    } catch (IOException e) {
+                        // Ignore failure (eg no internet connection).
+                    }
+                }
+            });
+            thread.start();
+
+        }
+    }
+}

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

@@ -19,7 +19,7 @@ public abstract class BaseNativeTypesHandler implements INativeTypesHandler {
     public List<String> getUpdatedCode(String baseUrl, Map<String, String> options) throws IOException, URISyntaxException {
         String url;
         List<String> javaCodeLines = new ArrayList<String>();
-        URIBuilder urlBuilder = this.getUrl(baseUrl,options);
+        URIBuilder urlBuilder = this.getUrl(baseUrl);
         for(Map.Entry<String, String> option : options.entrySet()) {
             urlBuilder.addParameter(option.getKey(),option.getValue());
         }
@@ -41,14 +41,15 @@ public List<String> getUpdatedCode(String baseUrl, Map<String, String> options)
     }
 
     @Override
-    public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws MalformedURLException, URISyntaxException {
+    public URIBuilder getUrl(String baseUrl) throws MalformedURLException, URISyntaxException {
         String serverUrl = baseUrl.endsWith("/") ? baseUrl : (baseUrl + "/");
         serverUrl = (serverUrl.startsWith("http://") || serverUrl.startsWith("https://")) ? serverUrl : ("http://" + serverUrl);
         URL url = new URL(serverUrl);
         String path = url.getPath().contains("?") ? url.getPath().split("\\?", 2)[0] : url.getPath();
         if (!path.endsWith(this.getRelativeTypesUrl() + "/")) {
             serverUrl += (this.getRelativeTypesUrl() + "/");
         }
+        serverUrl = toParentPath(serverUrl);
         URIBuilder builder;
 
         try {
@@ -59,4 +60,11 @@ public URIBuilder getUrl(String baseUrl, Map<String, String> options) throws Mal
         }
         return builder;
     }
+
+    public static String toParentPath(String path)
+    {
+        int pos = path.lastIndexOf("/");
+        if (pos == -1) return "/";
+        return path.substring(0, pos);
+    }
 }

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/Analytics.java

@@ -13,7 +13,7 @@
  */
 public interface INativeTypesHandler {
     String getFileExtension();
-    URIBuilder getUrl(String baseUrl, Map<String,String> options) throws MalformedURLException, URISyntaxException;
+    URIBuilder getUrl(String baseUrl) throws MalformedURLException, URISyntaxException;
     List<String> getUpdatedCode(String baseUrl, Map<String, String> options) throws IOException, URISyntaxException;
     String getRelativeTypesUrl();
     NativeTypesLanguage getTypesLanguage();

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/BaseNativeTypesHandler.java

@@ -0,0 +1,90 @@
+package net.servicestack.idea;
+
+import com.intellij.application.options.CodeStyleAbstractConfigurable;
+import com.intellij.openapi.options.Configurable;
+import com.intellij.openapi.options.ConfigurableProvider;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.util.ui.CheckBox;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+
+/**
+ * Created by Layoric on 27/05/2016.
+ */
+public class PluginSettingsConfigurable implements SearchableConfigurable {
+
+    private PluginSettingsView view;
+
+    private PluginSettingsService settings;
+
+    public PluginSettingsConfigurable(@NotNull PluginSettingsService settings) {
+        this.settings = settings;
+    }
+
+    @NotNull
+    @Override
+    public String getId() {
+        return "Settings.ServiceStackIDEA.Preview";
+    }
+
+    @Nullable
+    @Override
+    public Runnable enableSearch(String s) {
+        return null;
+    }
+
+    @Nls
+    @Override
+    public String getDisplayName() {
+        return "ServiceStackIDEA Settings";
+    }
+
+    @Nullable
+    @Override
+    public String getHelpTopic() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public JComponent createComponent() {
+        return getForm().getSettingsPanel();
+    }
+
+
+    @Override
+    public boolean isModified() {
+        return !getForm().getOptOutOfUsage().equals(settings.optOutOfStats);
+    }
+
+    @Override
+    public void apply() throws ConfigurationException {
+        if(settings == null)
+            settings = PluginSettingsService.getInstance();
+        settings.optOutOfStats = getForm().getOptOutOfUsage();
+    }
+
+    @Override
+    public void reset() {
+        if(settings == null)
+            settings = PluginSettingsService.getInstance();
+        getForm().setOptOutOfUsage(settings.optOutOfStats);
+    }
+
+    @Override
+    public void disposeUIResources() {
+        view = null;
+    }
+
+    @NotNull
+    public PluginSettingsView getForm() {
+        if (view == null) {
+            view = new PluginSettingsView();
+        }
+        return view;
+    }
+}

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/INativeTypesHandler.java

@@ -0,0 +1,28 @@
+package net.servicestack.idea;
+
+import com.intellij.openapi.components.*;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Created by Layoric on 27/05/2016.
+ */
+@State(name = "PluginSettingsService", storages = @Storage(id = "default", file = StoragePathMacros.APP_CONFIG + "/servicestack-settings.xml"))
+public class PluginSettingsService implements PersistentStateComponent<PluginSettingsService> {
+    public Boolean optOutOfStats = false;
+
+    @Nullable
+    @Override
+    public PluginSettingsService getState() {
+        return this;
+    }
+
+    @Override
+    public void loadState(PluginSettingsService pluginSettingsService) {
+        XmlSerializerUtil.copyBean(pluginSettingsService, this);
+    }
+
+    public static PluginSettingsService getInstance() {
+        return ServiceManager.getService( PluginSettingsService.class );
+    }
+}

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/PluginSettingsConfigurable.java

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.servicestack.idea.PluginSettingsView">
+  <grid id="27dc6" binding="settingsPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="c76c5" class="javax.swing.JCheckBox" binding="optOutOfUsageCheckBox" default-binding="true">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Opt out of usage collection "/>
+        </properties>
+      </component>
+      <vspacer id="32dbe">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+    </children>
+  </grid>
+</form>

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/PluginSettingsService.java

@@ -0,0 +1,59 @@
+package net.servicestack.idea;
+
+import com.intellij.uiDesigner.core.GridConstraints;
+import com.intellij.uiDesigner.core.GridLayoutManager;
+import com.intellij.uiDesigner.core.Spacer;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by Layoric on 27/05/2016.
+ */
+public class PluginSettingsView {
+    private JCheckBox optOutOfUsageCheckBox;
+    private JPanel settingsPanel;
+
+    public Boolean getOptOutOfUsage() {
+        return optOutOfUsageCheckBox.isSelected();
+    }
+
+    public void setOptOutOfUsage(Boolean value) {
+        optOutOfUsageCheckBox.setSelected(value);
+    }
+
+    public JPanel getSettingsPanel() {
+        return this.settingsPanel;
+    }
+
+    {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+        $$$setupUI$$$();
+    }
+
+    /**
+     * Method generated by IntelliJ IDEA GUI Designer
+     * >>> IMPORTANT!! <<<
+     * DO NOT edit this method OR call it in your code!
+     *
+     * @noinspection ALL
+     */
+    private void $$$setupUI$$$() {
+        settingsPanel = new JPanel();
+        settingsPanel.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
+        optOutOfUsageCheckBox = new JCheckBox();
+        optOutOfUsageCheckBox.setText("Opt out of usage collection ");
+        settingsPanel.add(optOutOfUsageCheckBox, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        final Spacer spacer1 = new Spacer();
+        settingsPanel.add(spacer1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+    }
+
+    /**
+     * @noinspection ALL
+     */
+    public JComponent $$$getRootComponent$$$() {
+        return settingsPanel;
+    }
+}