Browse Source

Reformat code.

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

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

@ -72,7 +72,7 @@ namespace ICSharpCode.WpfDesign.AddIn
this.UserContent = designer; this.UserContent = designer;
InitPropertyEditor(); InitPropertyEditor();
} }
this.UserContent=designer; this.UserContent = designer;
if (outline != null) { if (outline != null) {
outline.Root = null; outline.Root = null;
} }
@ -88,8 +88,8 @@ namespace ICSharpCode.WpfDesign.AddIn
context.Services.AddService(typeof(ChooseClassServiceBase), new IdeChooseClassService()); context.Services.AddService(typeof(ChooseClassServiceBase), new IdeChooseClassService());
}); });
settings.TypeFinder = MyTypeFinder.Create(this.PrimaryFile); settings.TypeFinder = MyTypeFinder.Create(this.PrimaryFile);
try{ try {
settings.ReportErrors=UpdateTasks; settings.ReportErrors = UpdateTasks;
designer.LoadDesigner(r, settings); designer.LoadDesigner(r, settings);
designer.ContextMenuOpening += (sender, e) => MenuService.ShowContextMenu(e.OriginalSource as UIElement, designer, "/AddIns/WpfDesign/Designer/ContextMenu"); designer.ContextMenuOpening += (sender, e) => MenuService.ShowContextMenu(e.OriginalSource as UIElement, designer, "/AddIns/WpfDesign/Designer/ContextMenu");
@ -101,10 +101,8 @@ namespace ICSharpCode.WpfDesign.AddIn
propertyGridView.PropertyGrid.SelectedItems = null; propertyGridView.PropertyGrid.SelectedItems = null;
designer.DesignContext.Services.Selection.SelectionChanged += OnSelectionChanged; designer.DesignContext.Services.Selection.SelectionChanged += OnSelectionChanged;
designer.DesignContext.Services.GetService<UndoService>().UndoStackChanged += OnUndoStackChanged; designer.DesignContext.Services.GetService<UndoService>().UndoStackChanged += OnUndoStackChanged;
} } catch {
catch this.UserContent = new WpfDocumentError();
{
this.UserContent=new WpfDocumentError();
} }
} }
} }
@ -114,7 +112,7 @@ namespace ICSharpCode.WpfDesign.AddIn
protected override void SaveInternal(OpenedFile file, System.IO.Stream stream) protected override void SaveInternal(OpenedFile file, System.IO.Stream stream)
{ {
if(IsDirty && designer.DesignContext!=null){ if (IsDirty && designer.DesignContext != null) {
XmlWriterSettings settings = new XmlWriterSettings(); XmlWriterSettings settings = new XmlWriterSettings();
settings.Indent = true; settings.Indent = true;
settings.IndentChars = EditorControlService.GlobalOptions.IndentationString; settings.IndentChars = EditorControlService.GlobalOptions.IndentationString;
@ -122,36 +120,35 @@ namespace ICSharpCode.WpfDesign.AddIn
using (XmlWriter xmlWriter = XmlTextWriter.Create(stream, settings)) { using (XmlWriter xmlWriter = XmlTextWriter.Create(stream, settings)) {
designer.SaveDesigner(xmlWriter); designer.SaveDesigner(xmlWriter);
} }
} } else {
else{ if (_stream.CanRead) {
if(_stream.CanRead){
_stream.Position = 0; _stream.Position = 0;
using (var reader = new StreamReader(_stream)) using (var reader = new StreamReader(_stream)) {
using (var writer = new StreamWriter(stream)) { using (var writer = new StreamWriter(stream)) {
writer.Write(reader.ReadToEnd()); writer.Write(reader.ReadToEnd());
}
} }
} }
} }
} }
void UpdateTasks(XamlErrorService xamlErrorService) void UpdateTasks(XamlErrorService xamlErrorService)
{ {
Debug.Assert(xamlErrorService!=null); Debug.Assert(xamlErrorService != null);
foreach (var task in tasks) { foreach (Task task in tasks) {
TaskService.Remove(task); TaskService.Remove(task);
} }
tasks.Clear(); 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); var task = new Task(PrimaryFile.FileName, error.Message, error.Column - 1, error.Line - 1, TaskType.Error);
tasks.Add(task); tasks.Add(task);
TaskService.Add(task); TaskService.Add(task);
} }
if (xamlErrorService.Errors.Count != 0) { if (xamlErrorService.Errors.Count != 0) {
WorkbenchSingleton.Workbench.GetPad(typeof (ErrorListPad)).BringPadToFront(); WorkbenchSingleton.Workbench.GetPad(typeof(ErrorListPad)).BringPadToFront();
} }
} }
@ -182,11 +179,11 @@ namespace ICSharpCode.WpfDesign.AddIn
if (!propertyGridView.PropertyGrid.IsNameCorrect) return; if (!propertyGridView.PropertyGrid.IsNameCorrect) return;
// get the XAML file // 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; if (fileName == null) return;
// parse the XAML file // 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 == null || info.CompilationUnit == null) return;
if (info.CompilationUnit.Classes.Count != 1) return; if (info.CompilationUnit.Classes.Count != 1) return;

Loading…
Cancel
Save