Browse Source

Reformat code.

pull/20/merge
Matt Ward 14 years ago
parent
commit
eebe2e928c
  1. 19
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

19
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

@ -101,9 +101,7 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -101,9 +101,7 @@ namespace ICSharpCode.WpfDesign.AddIn
propertyGridView.PropertyGrid.SelectedItems = null;
designer.DesignContext.Services.Selection.SelectionChanged += OnSelectionChanged;
designer.DesignContext.Services.GetService<UndoService>().UndoStackChanged += OnUndoStackChanged;
}
catch
{
} catch {
this.UserContent = new WpfDocumentError();
}
}
@ -122,29 +120,28 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -122,29 +120,28 @@ namespace ICSharpCode.WpfDesign.AddIn
using (XmlWriter xmlWriter = XmlTextWriter.Create(stream, settings)) {
designer.SaveDesigner(xmlWriter);
}
}
else{
} else {
if (_stream.CanRead) {
_stream.Position = 0;
using (var reader = new StreamReader(_stream))
using (var reader = new StreamReader(_stream)) {
using (var writer = new StreamWriter(stream)) {
writer.Write(reader.ReadToEnd());
}
}
}
}
}
void UpdateTasks(XamlErrorService xamlErrorService)
{
Debug.Assert(xamlErrorService != null);
foreach (var task in tasks) {
foreach (Task task in tasks) {
TaskService.Remove(task);
}
tasks.Clear();
foreach (var error in xamlErrorService.Errors) {
foreach (XamlError error in xamlErrorService.Errors) {
var task = new Task(PrimaryFile.FileName, error.Message, error.Column - 1, error.Line - 1, TaskType.Error);
tasks.Add(task);
TaskService.Add(task);
@ -182,11 +179,11 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -182,11 +179,11 @@ namespace ICSharpCode.WpfDesign.AddIn
if (!propertyGridView.PropertyGrid.IsNameCorrect) return;
// get the XAML file
var fileName = this.Files.Where(f => f.FileName.ToString().EndsWith(".xaml")).FirstOrDefault();
OpenedFile fileName = this.Files.Where(f => f.FileName.ToString().EndsWith(".xaml")).FirstOrDefault();
if (fileName == null) return;
// parse the XAML file
var info = ParserService.ParseFile(fileName.FileName.ToString());
ParseInformation info = ParserService.ParseFile(fileName.FileName.ToString());
if (info == null || info.CompilationUnit == null) return;
if (info.CompilationUnit.Classes.Count != 1) return;

Loading…
Cancel
Save