Added new read-only warning text to BIML overwrite, and turn off read-only file flag before copy on overwrite. Minor fixes for find references too

sqlgreen · sqlgreen · commit 06530f3590a6 · 2016-03-21T19:36:37.000Z
diff --git a/SSIS/Biml/BimlExpandPlugin.cs b/SSIS/Biml/BimlExpandPlugin.cs
@@ -163,24 +163,28 @@ private void Expand(List<string> bimlScriptPaths, Project project, string projec
 
 
                     List<string> newProjectFiles = new List<string>();
-                    string[] newPackageFiles = Directory.GetFiles(tempTargetDirectory, "*.dtsx", SearchOption.AllDirectories);
-                    newProjectFiles.AddRange(newPackageFiles);
-
 #if (!YUKON && !KATMAI)
                     //IF DENALI or later...
                     // Read packages AND project connection managers
                     string[] newConnFiles = Directory.GetFiles(tempTargetDirectory, "*.conmgr", SearchOption.AllDirectories);
                     newProjectFiles.AddRange(newConnFiles);
 #endif
+
+                    string[] newPackageFiles = Directory.GetFiles(tempTargetDirectory, "*.dtsx", SearchOption.AllDirectories);
+                    newProjectFiles.AddRange(newPackageFiles);
+
                     var safePackageFilePaths = new List<string>();
                     var conflictingPackageFilePaths = new List<string>();
+                    var conflictingPackageHighlights = new List<bool>();
                     foreach (var tempFilePath in newProjectFiles)
                     {
                         string tempFileName = Path.GetFileName(tempFilePath);
                         string projectItemFileName = Path.Combine(projectDirectory, tempFileName);
                         if (File.Exists(projectItemFileName))
                         {
                             conflictingPackageFilePaths.Add(tempFilePath);
+                            bool readOnly = new FileInfo(projectItemFileName).IsReadOnly;
+                            conflictingPackageHighlights.Add(readOnly);
                         }
                         else
                         {
@@ -190,7 +194,7 @@ private void Expand(List<string> bimlScriptPaths, Project project, string projec
 
                     if (conflictingPackageFilePaths.Count > 0)
                     {
-                        var dialog = new MultipleSelectionConfirmationDialog(conflictingPackageFilePaths, projectDirectory, safePackageFilePaths.Count);
+                        var dialog = new MultipleSelectionConfirmationDialog(conflictingPackageFilePaths, conflictingPackageHighlights, projectDirectory, safePackageFilePaths.Count);
                         if (dialog.ShowDialog() == DialogResult.OK)
                         {
                             foreach (var filePath in dialog.SelectedFilePaths)
@@ -337,6 +341,14 @@ private void Expand(List<string> bimlScriptPaths, Project project, string projec
                     foreach (var tempFilePath in safePackageFilePaths)
                     {
                         string projectItemFilePath = Path.Combine(projectDirectory, Path.GetFileName(tempFilePath));
+
+                        // Check for read-only and try and overwrite
+                        FileAttributes attributes = File.GetAttributes(projectItemFilePath);
+                        if (attributes.HasFlag(FileAttributes.ReadOnly))
+                        {
+                            File.SetAttributes(projectItemFilePath, attributes & ~FileAttributes.ReadOnly);
+                        }
+
                         File.Copy(tempFilePath, projectItemFilePath, true);
                         project.ProjectItems.AddFromFile(projectItemFilePath);
                     }
diff --git a/SSIS/Biml/MultipleSelectionConfirmationDialog.Designer.cs b/SSIS/Biml/MultipleSelectionConfirmationDialog.Designer.cs
diff --git a/SSIS/Biml/MultipleSelectionConfirmationDialog.cs b/SSIS/Biml/MultipleSelectionConfirmationDialog.cs
@@ -15,7 +15,7 @@ public IEnumerable<string> SelectedFilePaths
             get; private set;
         }
 
-        public MultipleSelectionConfirmationDialog(List<string> itemsSource, string projectDirectory, int safeCount)
+        public MultipleSelectionConfirmationDialog(List<string> itemsSource, List<bool> highlighted, string projectDirectory, int safeCount)
         {
             this.itemsSource = itemsSource;
             InitializeComponent();
@@ -24,10 +24,14 @@ public MultipleSelectionConfirmationDialog(List<string> itemsSource, string proj
                 "In addition to {0} new items, the template generated the following items that conflict with existing items.  Which of these items would you like to overwrite?",
                 safeCount);
 
+            int index = 0;
             foreach (var item in itemsSource)
             {
-                selectionList.AddItem(Path.Combine(projectDirectory, Path.GetFileName(item)), true);
+                selectionList.AddItem(Path.Combine(projectDirectory, Path.GetFileName(item)), true, highlighted[index]);
+                index++;
             }
+
+            panelWarning.Visible = (highlighted.Contains(true));
         }
 
         private void helpButton_Click(object sender, EventArgs e)
diff --git a/SSIS/FindVariableReferences.Designer.cs b/SSIS/FindVariableReferences.Designer.cs
diff --git a/SSIS/FindVariables.cs b/SSIS/FindVariables.cs
@@ -869,16 +869,29 @@ private void CheckForLoop(IDTSPropertiesProvider forLoop, TreeNode parent)
             ScanProperties(forLoop, parent);
 
             DtsProperty property;
+            object propertyValue;
 
             // Check explicit expression properties as expressions, missed if we are looking for literal variables.
             property = forLoop.Properties["AssignExpression"];
-            PropertyAsExpressionMatch(property, property.GetValue(forLoop).ToString(), parent);
+            propertyValue = property.GetValue(forLoop);
+            if (propertyValue != null)
+            {
+                PropertyAsExpressionMatch(property, propertyValue.ToString(), parent);
+            }
 
             property = forLoop.Properties["EvalExpression"];
-            PropertyAsExpressionMatch(property, property.GetValue(forLoop).ToString(), parent);
+            propertyValue = property.GetValue(forLoop);
+            if (propertyValue != null)
+            {
+                PropertyAsExpressionMatch(property, propertyValue.ToString(), parent);
+            }
 
             property = forLoop.Properties["InitExpression"];
-            PropertyAsExpressionMatch(property, property.GetValue(forLoop).ToString(), parent);
+            propertyValue = property.GetValue(forLoop);
+            if (propertyValue != null)
+            {
+                PropertyAsExpressionMatch(property, propertyValue.ToString(), parent);
+            }
         }
 
         private void PropertyAsExpressionMatch(DtsProperty property, string expression, TreeNode parent)
diff --git a/SSIS/ParametersWindowPlugin.cs b/SSIS/ParametersWindowPlugin.cs
@@ -65,14 +65,16 @@ public override void OnWindowActivated(Window GotFocus, Window LostFocus)
 
                 // We want the DtsPackageView, an EditorWindow, Microsoft.DataTransformationServices.Design.DtsPackageView
                 EditorWindow editorWindow = (EditorWindow)designer.GetService(typeof(Microsoft.DataWarehouse.ComponentModel.IComponentNavigator));
+                if (editorWindow == null)
+                    return;
 
                 if (editorWindow.Tag == null)
                 {
                     ParametersWindowManager manager = new ParametersWindowManager(editorWindow);
                 }
                 else
                 {
-                    // Safety check to see if anyoine else is using the Tag on the DtsPackageView
+                    // Safety check to see if anyone else is using the Tag on the DtsPackageView
                     ParametersWindowManager manager = editorWindow.Tag as ParametersWindowManager;
                     if (manager == null)
                     {
@@ -221,7 +223,7 @@ private void SetupControl()
                 // Find Unused button
                 this.findUnusedButton = new ToolBarButton();
                 this.findUnusedButton.Style = ToolBarButtonStyle.PushButton;
-                this.findUnusedButton.ToolTipText = "Find Parameter References (BIDS Helper)";
+                this.findUnusedButton.ToolTipText = "Find Unused Parameters (BIDS Helper)";
                 toolbar.Buttons.Add(this.findUnusedButton);
                 toolbar.ImageList.Images.Add(BIDSHelper.Resources.Versioned.VariableFindUnused);
                 this.findUnusedButton.ImageIndex = toolbar.ImageList.Images.Count - 1;
diff --git a/SSIS/VariablesWindowPlugin.cs b/SSIS/VariablesWindowPlugin.cs
@@ -127,7 +127,7 @@ private void HookupVariablesWindow(Window GotFocus)
                     if (this.moveCopyButton != null && toolbar.Buttons.Contains(this.moveCopyButton)) return;
 
 #if DENALI || SQL2014
-                    // When you clock the edit expression ellipsis button in the variables grid, we want to use our own expression editor, not the MS one.
+                    // When you click the edit expression ellipsis button in the variables grid, we want to use our own expression editor, not the MS one.
                     // The following section removes their event handler and adds our own
                     // Get the type of the variables grid, and get the MouseButtonClicked clicked event info
                     // Then get the private dlgGridControl1_MouseButtonClicked event handler method, and get an instance delegate
@@ -175,7 +175,7 @@ private void HookupVariablesWindow(Window GotFocus)
                     // Find Unused button
                     this.findUnusedButton = new ToolBarButton();
                     this.findUnusedButton.Style = ToolBarButtonStyle.PushButton;
-                    this.findUnusedButton.ToolTipText = "Find Variable References (BIDS Helper)";
+                    this.findUnusedButton.ToolTipText = "Find Unused Variables (BIDS Helper)";
                     toolbar.Buttons.Add(this.findUnusedButton);
                     toolbar.ImageList.Images.Add(BIDSHelper.Resources.Versioned.VariableFindUnused);
                     this.findUnusedButton.ImageIndex = toolbar.ImageList.Images.Count - 1;
diff --git a/core/SelectionList.cs b/core/SelectionList.cs
@@ -121,14 +121,26 @@ private void UpdateSelectAllCheckBox()
 
         public void AddItem(string item)
         {
-            AddItem(item, false);
+            AddItem(item, false, false);
         }
 
-        public void AddItem(string item, bool selected)
+        public void AddItem(string item, bool selected, bool highlighted)
         {
             if (this.SelectionEnabled)
             {
-                dataGridView.Rows.Add(selected, item);
+                // Add new row
+                int index = dataGridView.Rows.Add(selected, item);
+
+                // Set text to italic if "highlighted"
+                if (highlighted)
+                {
+                    DataGridViewCell cell = dataGridView.Rows[index].Cells[1];
+                    DataGridViewCellStyle style = cell.Style.Clone();
+                    style.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+                    cell.Style = style;
+                }
+
+                // Update selection checkbox stuff
                 totalItems++;
                 checkedItems += (selected ? 1 : 0);
                 UpdateSelectAllCheckBox();
@@ -143,7 +155,7 @@ public void AddRange(string[] items)
         {
             foreach (string item in items)
             {
-                AddItem(item, false);
+                AddItem(item, false, false);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public IEnumerable<string> SelectedFilePaths`
`15`	`15`	`get; private set;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public MultipleSelectionConfirmationDialog(List<string> itemsSource, string projectDirectory, int safeCount)`
	`18`	`+ public MultipleSelectionConfirmationDialog(List<string> itemsSource, List<bool> highlighted, string projectDirectory, int safeCount)`
`19`	`19`	`{`
`20`	`20`	`this.itemsSource = itemsSource;`
`21`	`21`	`InitializeComponent();`
`@@ -24,10 +24,14 @@ public MultipleSelectionConfirmationDialog(List<string> itemsSource, string proj`
`24`	`24`	`"In addition to {0} new items, the template generated the following items that conflict with existing items. Which of these items would you like to overwrite?",`
`25`	`25`	`safeCount);`
`26`	`26`
	`27`	`+ int index = 0;`
`27`	`28`	`foreach (var item in itemsSource)`
`28`	`29`	`{`
`29`		`- selectionList.AddItem(Path.Combine(projectDirectory, Path.GetFileName(item)), true);`
	`30`	`+ selectionList.AddItem(Path.Combine(projectDirectory, Path.GetFileName(item)), true, highlighted[index]);`
	`31`	`+ index++;`
`30`	`32`	`}`
	`33`	`+`
	`34`	`+ panelWarning.Visible = (highlighted.Contains(true));`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`private void helpButton_Click(object sender, EventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,16 @@ public override void OnWindowActivated(Window GotFocus, Window LostFocus)`
`65`	`65`
`66`	`66`	`// We want the DtsPackageView, an EditorWindow, Microsoft.DataTransformationServices.Design.DtsPackageView`
`67`	`67`	`EditorWindow editorWindow = (EditorWindow)designer.GetService(typeof(Microsoft.DataWarehouse.ComponentModel.IComponentNavigator));`
	`68`	`+ if (editorWindow == null)`
	`69`	`+ return;`
`68`	`70`
`69`	`71`	`if (editorWindow.Tag == null)`
`70`	`72`	`{`
`71`	`73`	`ParametersWindowManager manager = new ParametersWindowManager(editorWindow);`
`72`	`74`	`}`
`73`	`75`	`else`
`74`	`76`	`{`
`75`		`- // Safety check to see if anyoine else is using the Tag on the DtsPackageView`
	`77`	`+ // Safety check to see if anyone else is using the Tag on the DtsPackageView`
`76`	`78`	`ParametersWindowManager manager = editorWindow.Tag as ParametersWindowManager;`
`77`	`79`	`if (manager == null)`
`78`	`80`	`{`
`@@ -221,7 +223,7 @@ private void SetupControl()`
`221`	`223`	`// Find Unused button`
`222`	`224`	`this.findUnusedButton = new ToolBarButton();`
`223`	`225`	`this.findUnusedButton.Style = ToolBarButtonStyle.PushButton;`
`224`		`- this.findUnusedButton.ToolTipText = "Find Parameter References (BIDS Helper)";`
	`226`	`+ this.findUnusedButton.ToolTipText = "Find Unused Parameters (BIDS Helper)";`
`225`	`227`	`toolbar.Buttons.Add(this.findUnusedButton);`
`226`	`228`	`toolbar.ImageList.Images.Add(BIDSHelper.Resources.Versioned.VariableFindUnused);`
`227`	`229`	`this.findUnusedButton.ImageIndex = toolbar.ImageList.Images.Count - 1;`
Original file line number	Diff line number	Diff line change
`@@ -121,14 +121,26 @@ private void UpdateSelectAllCheckBox()`
`121`	`121`
`122`	`122`	`public void AddItem(string item)`
`123`	`123`	`{`
`124`		`- AddItem(item, false);`
	`124`	`+ AddItem(item, false, false);`
`125`	`125`	`}`
`126`	`126`
`127`		`- public void AddItem(string item, bool selected)`
	`127`	`+ public void AddItem(string item, bool selected, bool highlighted)`
`128`	`128`	`{`
`129`	`129`	`if (this.SelectionEnabled)`
`130`	`130`	`{`
`131`		`- dataGridView.Rows.Add(selected, item);`
	`131`	`+ // Add new row`
	`132`	`+ int index = dataGridView.Rows.Add(selected, item);`
	`133`	`+`
	`134`	`+ // Set text to italic if "highlighted"`
	`135`	`+ if (highlighted)`
	`136`	`+ {`
	`137`	`+ DataGridViewCell cell = dataGridView.Rows[index].Cells[1];`
	`138`	`+ DataGridViewCellStyle style = cell.Style.Clone();`
	`139`	`+ style.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));`
	`140`	`+ cell.Style = style;`
	`141`	`+ }`
	`142`	`+`
	`143`	`+ // Update selection checkbox stuff`
`132`	`144`	`totalItems++;`
`133`	`145`	`checkedItems += (selected ? 1 : 0);`
`134`	`146`	`UpdateSelectAllCheckBox();`
`@@ -143,7 +155,7 @@ public void AddRange(string[] items)`
`143`	`155`	`{`
`144`	`156`	`foreach (string item in items)`
`145`	`157`	`{`
`146`		`- AddItem(item, false);`
	`158`	`+ AddItem(item, false, false);`
`147`	`159`	`}`
`148`	`160`	`}`
`149`	`161`