Refactoring Extruct Method & If Block.

Author: nuitsjp

CopyFromExcelToMarkdownAddIn/CopyFromExcelToMarkdownAddIn/CopyFromExcelToMarkdownAddIn.csproj

@@ -34,7 +34,7 @@
     <PublishUrl>C:\Users\z00h800459\Source\Repos\CopyFromExcelToMarkdownAddIn\publish\</PublishUrl>
     <InstallUrl />
     <TargetCulture>ja</TargetCulture>
-    <ApplicationVersion>1.0.1.1</ApplicationVersion>
+    <ApplicationVersion>1.0.2.1</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>7</UpdateInterval>

CopyFromExcelToMarkdownAddIn/CopyFromExcelToMarkdownAddIn/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@
 // すべての値を指定するか、以下のように '*' を使ってビルドおよびリビジョン番号を
 // 既定値にすることができます。
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.*")]
+[assembly: AssemblyVersion("1.0.2.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 

CopyFromExcelToMarkdownAddIn/CopyFromExcelToMarkdownAddIn/ThisAddIn.cs

@@ -62,63 +62,73 @@ private void ThisAddIn_Shutdown(object sender, EventArgs e)
         private void CopyToMarkdown(CommandBarButton ctrl, ref bool cancelDefault)
         {
             var range = Application.Selection as Range;
-            if (range != null)
+            if (range == null)
             {
-                var rowsCount = range.Rows.Count;
-                if (MinRowCount <= rowsCount)
-                {
-                    var columnsCount = range.Count / rowsCount;
-                    var resultBuffer = new StringBuilder();
-                    var separatorBuffer = new StringBuilder();
-                    for (int x = 1; x <= columnsCount; x++)
-                    {
-                        var cell = (Range)range.Cells[1, x];
-
-                        resultBuffer.Append("|");
-                        resultBuffer.Append(cell.Text == null ? string.Empty : cell.Text.Replace("\n", "<br>"));
-                        switch ((int)cell.HorizontalAlignment)
-                        {
-                            case AlignmentCenter:
-                                separatorBuffer.Append("|:-:");
-                                break;
-                            case AlignmentRight:
-                                separatorBuffer.Append("|--:");
-                                break;
-                            default:
-                                separatorBuffer.Append("|:--");
-                                break;
-                        }
-                    }
-                    // Partition of the header and data lines.
-                    // Process only after the first line.
-                    resultBuffer.Append("|");
-                    resultBuffer.Append(Environment.NewLine);
-                    separatorBuffer.Append("|");
-                    separatorBuffer.Append(Environment.NewLine);
-                    resultBuffer.Append(separatorBuffer);
+                MessageBox.Show(Properties.Resources.UnselectedErrorMessage);
+                return;
+            }
+            
+            var rowsCount = range.Rows.Count;
+            if (rowsCount < MinRowCount)
+            {
+                MessageBox.Show(Properties.Resources.UnselectedErrorMessage);
+                return;
+            }
 
-                    for (int y = 2; y <= rowsCount; y++)
-                    {
-                        for (int x = 1; x <= columnsCount; x++)
-                        {
-                            var cell = (Range)range.Cells[y, x];
+            var columnsCount = range.Count / rowsCount;
+            var resultBuffer = new StringBuilder();
+            var separatorBuffer = new StringBuilder();
+            for (int x = 1; x <= columnsCount; x++)
+            {
+                var cell = (Range)range.Cells[1, x];
 
-                            resultBuffer.Append("|");
-                            resultBuffer.Append(cell.Text == null ? string.Empty : cell.Text.Replace("\n","<br>"));
-                        }
-                        resultBuffer.Append("|");
-                        resultBuffer.Append(Environment.NewLine);
-                    }
-                    Clipboard.SetText(resultBuffer.ToString());
+                resultBuffer.Append("|");
+                resultBuffer.Append(FormatText(cell));
+                switch ((int)cell.HorizontalAlignment)
+                {
+                    case AlignmentCenter:
+                        separatorBuffer.Append("|:-:");
+                        break;
+                    case AlignmentRight:
+                        separatorBuffer.Append("|--:");
+                        break;
+                    default:
+                        separatorBuffer.Append("|:--");
+                        break;
                 }
-                else
+            }
+            // Partition of the header and data lines.
+            // Process only after the first line.
+            resultBuffer.Append("|");
+            resultBuffer.Append(Environment.NewLine);
+            separatorBuffer.Append("|");
+            separatorBuffer.Append(Environment.NewLine);
+            resultBuffer.Append(separatorBuffer);
+
+            for (int y = 2; y <= rowsCount; y++)
+            {
+                for (int x = 1; x <= columnsCount; x++)
                 {
-                    MessageBox.Show(Properties.Resources.UnselectedErrorMessage);
+                    var cell = (Range)range.Cells[y, x];
+
+                    resultBuffer.Append("|");
+                    resultBuffer.Append(FormatText(cell));
                 }
+                resultBuffer.Append("|");
+                resultBuffer.Append(Environment.NewLine);
+            }
+            Clipboard.SetText(resultBuffer.ToString());
+        }
+
+        private static string FormatText(Range range)
+        {
+            if (range == null || range.Text == null)
+            {
+                return string.Empty;
             }
             else
             {
-                MessageBox.Show(Properties.Resources.UnselectedErrorMessage);
+                return range.Text.Replace("\n", "<br>");
             }
         }