其他-解冲突

PDF Office/CustomControl/WritableComboBox.xaml

@@ -12,11 +12,7 @@
         <ComboBox x:Name="writableComboBox" Grid.Column="1"  Visibility="Visible" MinHeight="32"  MinWidth="58"
                                       SelectionChanged="writableComboBox_SelectionChanged" SelectedIndex="0">
             <ComboBoxItem Tag="0">全部页面</ComboBoxItem>
-<<<<<<< Updated upstream
-            <ComboBoxItem Tag="0">奇数页</ComboBoxItem>
-=======
             <ComboBoxItem Tag="1">奇数页</ComboBoxItem>
->>>>>>> Stashed changes
             <ComboBoxItem Tag="1">偶数页</ComboBoxItem>
             <ComboBoxItem Tag="1">自定义页面</ComboBoxItem>
         </ComboBox>

PDF Office/CustomControl/WritableComboBox.xaml.cs

@@ -1,100 +1,77 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace PDF_Office.CustomControl
-{
-    /// <summary>
-    /// WritableComboBox.xaml 的交互逻辑
-    /// </summary>
-    public partial class WritableComboBox : UserControl
-    {
-        public WritableComboBox()
-        {
-            InitializeComponent();
-        }
-        private void writableComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
-            {
-                this.writableTextBox.Width = this.writableComboBox.ActualWidth - 18;
-                Trace.WriteLine(this.writableComboBox.ActualWidth);
-                this.writableTextBox.Visibility = Visibility.Visible;
-<<<<<<< Updated upstream
-                
-            }
-            else
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PDF_Office.CustomControl
+{
+    /// <summary>
+    /// WritableComboBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class WritableComboBox : UserControl
+    {
+        public WritableComboBox()
+        {
+            InitializeComponent();
+        }
+        private void writableComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
             {
-                if (this.writableTextBox != null) { 
-                this.writableTextBox.Visibility = Visibility.Hidden;
-                }
-           this.SelectedIndex=this.writableComboBox.SelectedIndex.ToString();
-=======
-
-            }
-            else
-            {
-                if (this.writableTextBox != null)
-                {
-                    this.writableTextBox.Visibility = Visibility.Collapsed;
-                }
->>>>>>> Stashed changes
-            }
-            this.SelectedIndex = this.writableComboBox.SelectedIndex.ToString();
-        }
-
-        public string SelectedIndex
-        {
-            get { return (string)GetValue(SelectedIndexProperty); }
-            set { SetValue(SelectedIndexProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty SelectedIndexProperty =
-            DependencyProperty.Register("SelectedIndex", typeof(string), typeof(WritableComboBox), new PropertyMetadata(""));
-
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty TextProperty =
-<<<<<<< Updated upstream
+                this.writableTextBox.Width = this.writableComboBox.ActualWidth - 18;
+                Trace.WriteLine(this.writableComboBox.ActualWidth);
+                this.writableTextBox.Visibility = Visibility.Visible;
+                
+            }
+            else
+            {
+                if (this.writableTextBox != null) { 
+                this.writableTextBox.Visibility = Visibility.Hidden;
+                }
+           this.SelectedIndex=this.writableComboBox.SelectedIndex.ToString();
+
+            }
+        }
+
+        public string SelectedIndex
+        {
+            get { return (string)GetValue(SelectedIndexProperty); }
+            set { SetValue(SelectedIndexProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty SelectedIndexProperty =
+            DependencyProperty.Register("SelectedIndex", typeof(string), typeof(WritableComboBox), new PropertyMetadata(""));
+
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for MyProperty.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty TextProperty =
+
             DependencyProperty.Register("Text", typeof(string), typeof(WritableComboBox), new PropertyMetadata(""));
 
         private void writableTextBox_TextChange(object sender, TextChangedEventArgs e)
         {
-            if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
+            if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
             {
                 Text = this.writableTextBox.Text;
             }
             else { Text = ""; }
         }
-=======
-            DependencyProperty.Register("Text", typeof(string), typeof(WritableComboBox), new PropertyMetadata(""));
-
-        private void writableTextBox_TextChange(object sender, TextChangedEventArgs e)
-        {
-            if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
-            {
-                Text = this.writableTextBox.Text;
-            }
-            else { Text = ""; }
-        }
->>>>>>> Stashed changes
-    }
-}
+    }
+}

PDF Office/Model/Dialog/HomePageToolsDialogs/HomePageExtractDialogModel.cs

@@ -4,25 +4,25 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.Model.Dialog.HomePageToolsDialogs
+namespace PDF_Office.Model.HomePageToolsDialogs
 {
-    internal class HomePageExtractDialogModel
+    public class HomePageExtractDialogModel
     {
         /// <summary>
         /// 页码 存入页码范围;
         /// </summary>
-        public List<int> PageParm;
+        public List<int> PageParm = new List<int> { };
         /// <summary>
-        /// 自定模式下 把文本内容传过去
+        /// 页码 存入页码范围;
         /// </summary>
-        public string PageName = "";
+        public string PageRange = "1,3-4,10";
         /// <summary>
         /// 是否拆分为单文件
         /// </summary>
-        public bool ExtractToSingleFile;
+        public bool ExtractToSingleFile = true;
         /// <summary>
         /// 提取后删除页面
         /// </summary>
-        public bool DeleteAfterExtract;
+        public bool DeleteAfterExtract = false;
     }
 }

PDF Office/Model/Dialog/HomePageToolsDialogs/HomePageInsertDialogModel.cs

@@ -1,26 +1,23 @@
-using System;
+using ComPDFKit.PDFDocument;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.Model.Dialog.HomePageToolsDialogs
+namespace PDF_Office.Model.HomePageToolsDialogs
 {
-    internal class HomePageInsertDialogModel
+    public class HomePageInsertDialogModel
     {
-        public class InsertEventClass : EventArgs
+        public string FilePath = "";
+        public int InsertIndex = 1;
+        public string Password = "";
+        public string InserPageRange(CPDFDocument doc)
         {
-            public InsertType Type;
-            public string filePath;
-            public string pageRange;
-            public int InsertIndex;
-            public string Password;
+            if (doc.PageCount < 1) { return ""; }
+            if (doc.PageCount == 1) { return "1"; }
+            return "1" + "-" + doc.PageCount.ToString();
         }
 
-        public enum InsertType
-        {
-            BlankPages,
-            FromOtherPdf
-        }
     }
 }

PDF Office/Model/Dialog/HomePageToolsDialogs/HomePageSplitDialogModel.cs

@@ -4,26 +4,40 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.Model.Dialog.HomePageToolsDialogs
+namespace PDF_Office.Model.HomePageToolsDialogs
 {
-    internal class HomePageSplitDialogModel
+    public class HomePageSplitDialogModel
     {
-        public class SplitEventClass : EventArgs
-        {
-            /// <summary>
-            /// 拆分模式
-            /// </summary>
-            public SplitMode Mode;
-            /// <summary>
-            /// 文件名
-            /// </summary>
-            public string FileName;
-            /// <summary>
-            /// 页面信息
-            /// </summary>
-            public string PageRange;
 
-        }
+        /// <summary>
+        /// 拆分模式
+        /// </summary>
+        public SplitMode Mode = SplitMode.AveragePages;
+        /// <summary>
+        /// 拆分模式份数或者页数
+        /// </summary>
+        public int GetModeCount = 1;
+        /// <summary>
+        /// 页面信息
+        /// </summary>
+        public string PageRange = "1,3-4,10";
+        /// <summary>
+        /// 文件名标签
+        /// </summary>
+        public string FileNameLabel = "part";
+        /// <summary>
+        /// 文件名与标签分隔符
+        /// </summary>
+        public string FileNameDeimiter = "-";
+        /// <summary>
+        /// 文件名与标签分隔符
+        /// </summary>
+        public bool FrontFileName = true;
+        /// <summary>
+        /// 页码 存入页码范围;
+        /// </summary>
+        public List<int> PageParm = new List<int> { };
+
 
         public enum SplitMode
         {

PDF Office/PDF Office.csproj

@@ -186,16 +186,10 @@
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\CheckPasswordDialogModel.cs" />
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\DeleteSafetySettintgsModel.cs" />
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\SetPasswordDialogModel.cs" />
-<<<<<<< Updated upstream
-    <Compile Include="Model\HomePageToolsDialogs\HomePageExtractDialogModel.cs" />
-    <Compile Include="Model\HomePageToolsDialogs\HomePageInsertDialogModel.cs" />
-    <Compile Include="Model\HomePageToolsDialogs\HomePageSplitDialogModel.cs" />
-=======
     <Compile Include="Model\Dialog\HomePageToolsDialogs\HomePageExtractDialogModel.cs" />
     <Compile Include="Model\Dialog\HomePageToolsDialogs\HomePageInsertDialogModel.cs" />
     <Compile Include="Model\Dialog\HomePageToolsDialogs\HomePagePrinter\HomePagePrinterDialogModel.cs" />
     <Compile Include="Model\Dialog\HomePageToolsDialogs\HomePageSplitDialogModel.cs" />
->>>>>>> Stashed changes
     <Compile Include="Model\PageEdit\ExtractModel.cs" />
     <Compile Include="Model\PageEdit\PageEditItem.cs" />
     <Compile Include="Model\ParameterNames.cs" />

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageExtractDialogViewModel.cs

@@ -12,10 +12,11 @@ using PDF_Office.Model.HomePageToolsDialogs;
 using PDF_Office.Helper;
 using System.Diagnostics;
 using PDF_Office.CustomControl;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
 {
-    public class HomePageExtractDialogViewModel : BindableBase,IDialogAware
+    public class HomePageExtractDialogViewModel : BindableBase, IDialogAware
     {
         private CPDFDocument document;
 
@@ -96,13 +97,16 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             if (!CommonHelper.GetPagesInRange(ref extractModel.PageParm, extractModel.PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
             { //TODO
                 Trace.WriteLine("输入不对");
-                return; }
-            if (extractModel.ExtractToSingleFile) {
-                for (int i=0; i<extractModel.PageParm.ToArray().Length;i++) {
+                return;
+            }
+            if (extractModel.ExtractToSingleFile)
+            {
+                for (int i = 0; i < extractModel.PageParm.ToArray().Length; i++)
+                {
                     CPDFDocument extractdoc = CPDFDocument.CreateDocument();
-                    extractdoc.ImportPages(currentViewer.Document, (extractModel.PageParm.ToArray()[i]+1).ToString());
+                    extractdoc.ImportPages(currentViewer.Document, (extractModel.PageParm.ToArray()[i] + 1).ToString());
                     Trace.WriteLine(extractModel.PageParm.ToArray()[i].ToString());
-                    extractdoc.WriteToFilePath(savefilepath + ".extract"+i.ToString()+".pdf");
+                    extractdoc.WriteToFilePath(savefilepath + ".extract" + i.ToString() + ".pdf");
                     extractdoc.Release();
                 }
                 if (extractModel.DeleteAfterExtract)
@@ -110,7 +114,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                     currentViewer.Document.RemovePages(extractModel.PageParm.ToArray());
                     currentViewer.Document.WriteToLoadedPath();
                 }
-                
+
             }
             else
             {
@@ -128,19 +132,22 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             RequestClose.Invoke(new DialogResult(ButtonResult.OK));
         }
 
-        private void extractToSingleFile() {
+        private void extractToSingleFile()
+        {
             if (ExtractToSingleFileIsCheck == "True")
             {
                 extractModel.ExtractToSingleFile = true;
                 Trace.WriteLine("ExtractToSingleFileIsCheck" + extractModel.ExtractToSingleFile);
             }
-            else {
+            else
+            {
                 extractModel.ExtractToSingleFile = false;
                 Trace.WriteLine("ExtractToSingleFileIsCheck" + extractModel.ExtractToSingleFile);
             }
         }
 
-        private void deleteAfterExtract() {
+        private void deleteAfterExtract()
+        {
 
             if (DeleteAfterExtractIsCheck == "True")
             {
@@ -152,7 +159,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                 extractModel.DeleteAfterExtract = false;
                 Trace.WriteLine("DeleteAfterExtractIsCheck" + extractModel.DeleteAfterExtract);
             }
-            
+
         }
 
         public string Title => "";
@@ -174,9 +181,9 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             string filepath = "";
             parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out viewer);
             parameters.TryGetValue<string>(ParameterNames.FilePath, out filepath);
-            if (viewer != null&&viewer.Document!=null)
+            if (viewer != null && viewer.Document != null)
             {
-                currentViewer=viewer;
+                currentViewer = viewer;
                 savefilepath = filepath;
                 PageTurningPreview.document = currentViewer.Document;
 

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageInsertDialogViewModel.cs

@@ -15,10 +15,11 @@ using static PDF_Office.Model.Dialog.ToolsDialogs.SaftyDialogs.SetPasswordDialog
 using System.Windows.Forms;
 using DialogResult = Prism.Services.Dialogs.DialogResult;
 using PDF_Office.CustomControl;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
 {
-    public class HomePageInsertDialogViewModel : BindableBase,IDialogAware
+    public class HomePageInsertDialogViewModel : BindableBase, IDialogAware
     {
         private CPDFViewer currentViewer;
 
@@ -58,7 +59,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             }
         }
 
-        private string pageNumber="1";
+        private string pageNumber = "1";
         public string PageNumber
         {
             get { return pageNumber; }
@@ -71,12 +72,14 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
         private string pageInsertIndex = "1";
         public string PageInsertIndex
         {
-            get {
-                    return pageInsertIndex; }
+            get
+            {
+                return pageInsertIndex;
+            }
             set
             {
                 if (int.Parse(pageInsertIndex) > currentViewer.Document.PageCount)
-                { pageInsertIndex= currentViewer.Document.PageCount.ToString(); }
+                { pageInsertIndex = currentViewer.Document.PageCount.ToString(); }
                 SetProperty(ref pageInsertIndex, value);
             }
         }
@@ -138,7 +141,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
 
         private void insert()
         {
-            
+
             CPDFDocument insertdocument = CPDFDocument.InitWithFilePath(insertModel.FilePath);
             if (insertdocument == null)
             {
@@ -146,31 +149,31 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                 //TODO
                 return;
             }
-            if (insertdocument.IsEncrypted) {
+            if (insertdocument.IsEncrypted)
+            {
                 Trace.WriteLine("youmima");
                 //TODO
                 return;
             }
-            if (PageLocation == "1") {
-                insertModel.InsertIndex=insertModel.InsertIndex - 1;
+            if (PageLocation == "1")
+            {
+                insertModel.InsertIndex = insertModel.InsertIndex - 1;
             }
             currentViewer.Document.ImportPagesAtIndex(insertdocument, insertModel.InserPageRange(insertdocument), insertModel.InsertIndex);
-            currentViewer.UndoManager.ClearHistory();
-            currentViewer.UndoManager.CanSave = true;
-            currentViewer.ReloadDocument();
             currentViewer.Document.WriteToLoadedPath();
             insertdocument.Release();
             System.Diagnostics.Process.Start("Explorer", "/select," + currentViewer.Document.FilePath);
             RequestClose.Invoke(new DialogResult(ButtonResult.OK));
         }
 
-        private void selectFile() {
+        private void selectFile()
+        {
             System.Windows.Forms.OpenFileDialog dlg = new System.Windows.Forms.OpenFileDialog();
             dlg.Multiselect = false;
             dlg.Filter = "PDF|*.pdf;*.PDF;";
             if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                insertModel.FilePath= dlg.FileName;
+                insertModel.FilePath = dlg.FileName;
                 SelectFilePath = dlg.FileName;
             }
 
@@ -225,7 +228,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             {
                 currentViewer = viewer;
                 saveFilePath = filepath;
-                PageNumber=currentViewer.Document.PageCount.ToString();
+                PageNumber = currentViewer.Document.PageCount.ToString();
                 PageTurningPreview.document = currentViewer.Document;
             }
         }

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePrinter/HomePagePrinterDialogViewModel.cs

@@ -1,27 +1,4 @@
-<<<<<<< Updated upstream
-using ComPDFKit.PDFDocument;
-using PDF_Office.Model;
-using Prism.Commands;
-using Prism.Mvvm;
-using Prism.Services.Dialogs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
-{
-    public class HomePagePrinterDialogViewModel : BindableBase,IDialogAware
-    {
-        private CPDFDocument document;
-
-        public IDialogService dialogs;
-
-        public HomePagePrinterDialogViewModel(IDialogService dialogService)
-        {
-            dialogs = dialogService;
-=======
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePagePrinter;
+using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePagePrinter;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -33,6 +10,8 @@ using System.Windows;
 using System.Diagnostics;
 using System.Drawing.Printing;
 using PDFSettings;
+using ComPDFKit.PDFDocument;
+using PDF_Office.Model;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
 {
@@ -80,6 +59,8 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
         }
 
         private List<string> _printerDirectionList;
+        private CPDFDocument document;
+
         public List<string> PrintDirectionList
         {
             get { return _printerDirectionList; }
@@ -173,7 +154,6 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                 EnterSelectedMod(currentPrintModName);
                 //TODO：
             }
->>>>>>> Stashed changes
         }
 
         public string Title => "";
@@ -191,14 +171,12 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
 
         public void OnDialogOpened(IDialogParameters parameters)
         {
-<<<<<<< Updated upstream
             CPDFDocument doc = null;
             parameters.TryGetValue<CPDFDocument>(ParameterNames.PDFDocument, out doc);
             if (doc != null)
             {
                 document = doc;
             }
-=======
             PrintModRegion.RequestNavigate(PrintModRegionName, GetContentByPrintMod["ModSize"]);
         }
 
@@ -213,7 +191,6 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
 
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
->>>>>>> Stashed changes
         }
     }
 }

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageSplitDialogViewModel.cs

@@ -9,7 +9,6 @@ using PDF_Office.Helper;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using PDF_Office.Model.HomePageToolsDialogs;
 using ImTools;
 using PDF_Office.Model.PageEdit;
 using ComPDFKit.PDFPage;
@@ -17,6 +16,8 @@ using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using System.Windows.Media;
 using PDF_Office.CustomControl;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs;
+using PDF_Office.Model.HomePageToolsDialogs;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
 {

PDF Office/ViewModels/HomePanel/HomeGuidContentViewModel.cs

@@ -74,7 +74,6 @@ namespace PDF_Office.ViewModels.HomePanel
                     case PDFToolType.Merge:
                         break;
 
-<<<<<<< Updated upstream
                     case PDFToolType.Print:
                         DialogParameters printvalue = new DialogParameters();
                         printvalue.Add(ParameterNames.PDFViewer, viewer); ;
@@ -85,13 +84,6 @@ namespace PDF_Office.ViewModels.HomePanel
                     case PDFToolType.Security:
                         break;
                 }
-=======
-                case PDFToolType.Print:
-                    DialogParameters printvalue = new DialogParameters();
-
-                    dialogs.ShowDialog(DialogNames.HomePagePrinterDialog, printvalue, e => { });
-                    break;
->>>>>>> Stashed changes
 
             }
         }