From f92aa0db9a94b7485e9fe4234e910681724a98b7 Mon Sep 17 00:00:00 2001
From: martind2000 <Martin.Donnelly@franklintempleton.com>
Date: Tue, 27 Jun 2017 13:16:38 +0100
Subject: [PATCH] WS-2017.1.4 <mdonnel@EDINBK107739 Update find.xml, diff.xml,
 duplocatorSettings.xml

---
 diff.xml               | 33 +----------------------
 duplocatorSettings.xml | 60 ++++++++++--------------------------------
 find.xml               |  6 ++---
 3 files changed, 18 insertions(+), 81 deletions(-)

diff --git a/diff.xml b/diff.xml
index ce1ab09..c0e7faa 100644
--- a/diff.xml
+++ b/diff.xml
@@ -1,43 +1,12 @@
 <application>
-  <component name="DiffSettings">
-    <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings />
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings />
-      </entry>
-      <entry key="Default">
-        <PlaceSettings />
-      </entry>
-      <entry key="TestsFiledAssertions">
-        <PlaceSettings />
-      </entry>
-    </option>
-  </component>
+  <component name="DiffManager" COMPARISON_POLICY="Ignore spaces" />
   <component name="TextDiffSettings">
     <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
       <entry key="Default">
         <PlaceSettings>
           <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
         </PlaceSettings>
       </entry>
-      <entry key="Merge">
-        <PlaceSettings />
-      </entry>
-      <entry key="TestsFiledAssertions">
-        <PlaceSettings />
-      </entry>
     </option>
   </component>
 </application>
\ No newline at end of file
diff --git a/duplocatorSettings.xml b/duplocatorSettings.xml
index 1d68ec7..281b1ac 100644
--- a/duplocatorSettings.xml
+++ b/duplocatorSettings.xml
@@ -1,48 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <application>
-  <component name="MultiLanguageDuplocatorSettings" language="JavaScript">
-    object
-    <option name="LOWER_BOUND" value="4" />
-    <option name="DISCARD_COST" value="0" />
-    <option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
-    object
-    <option name="DISTINGUISH_VARIABLES" value="false" />
-    <option name="DISTINGUISH_FUNCTIONS" value="false" />
-    <option name="DISTINGUISH_LITERALS" value="false" />
-    <option name="LOWER_BOUND" value="10" />
-    <option name="DISCARD_COST" value="0" />
-    object
-    <option name="DISTINGUISH_VARIABLES" value="false" />
-    <option name="DISTINGUISH_FUNCTIONS" value="true" />
-    <option name="DISTINGUISH_LITERALS" value="true" />
-    <option name="LOWER_BOUND" value="10" />
-    <option name="DISCARD_COST" value="0" />
-    object
-    <option name="LOWER_BOUND" value="4" />
-    <option name="DISCARD_COST" value="0" />
-    <option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
-    object
-    <option name="DISTINGUISH_VARIABLES" value="false" />
-    <option name="DISTINGUISH_FUNCTIONS" value="true" />
-    <option name="DISTINGUISH_LITERALS" value="true" />
-    <option name="LOWER_BOUND" value="10" />
-    <option name="DISCARD_COST" value="0" />
-    object
-    <option name="LOWER_BOUND" value="4" />
-    <option name="DISCARD_COST" value="0" />
-    <option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
-    object
-    <option name="DISTINGUISH_VARIABLES" value="false" />
-    <option name="DISTINGUISH_FUNCTIONS" value="true" />
-    <option name="DISTINGUISH_LITERALS" value="true" />
-    <option name="LOWER_BOUND" value="10" />
-    <option name="DISCARD_COST" value="0" />
-    object
-    <option name="DISTINGUISH_VARIABLES" value="false" />
-    <option name="DISTINGUISH_FUNCTIONS" value="true" />
-    <option name="DISTINGUISH_LITERALS" value="true" />
-    <option name="LOWER_BOUND" value="10" />
-    <option name="DISCARD_COST" value="0" />
+  <component name="DuplocatorSettings">
+    <option name="SELECTED_PROFILES">
+      <set>
+        <option value="ECMAScript 6" />
+        <option value="JavaScript" />
+      </set>
+    </option>
+    <option name="LAST_SELECTED_LANGUAGE" value="ECMAScript 6" />
   </component>
-</application>
-
+  <component name="MultiLanguageDuplocatorSettings">
+    <object language="ECMAScript 6">
+      <option name="DISTINGUISH_FUNCTIONS" value="false" />
+    </object>
+  </component>
+</application>
\ No newline at end of file
diff --git a/find.xml b/find.xml
index d1dc064..1acd922 100644
--- a/find.xml
+++ b/find.xml
@@ -1,10 +1,10 @@
 <application>
   <component name="FindSettings">
-    <option name="customScope" value="All Places" />
-    <option name="defaultScopeName" value="All Places" />
+    <option name="customScope" value="Directory '[web-platform] - ...\src\components\products\portfolio'" />
+    <option name="defaultScopeName" value="Directory '[web-platform] - ...\src\components\products\portfolio'" />
     <option name="skipResultsWithOneUsage" value="true" />
     <option name="SKIP_RESULTS_WHEN_ONE_USAGE" value="true" />
-    <option name="SEARCH_SCOPE" value="All Places" />
+    <option name="SEARCH_SCOPE" value="Directory '[web-platform] - ...\src\components\products\portfolio'" />
     <recentFileMasks>
       <mask>*.properties</mask>
       <mask>*.jsp</mask>