pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reformat code and fix typos.

pull/22/merge
Matt Ward 14 years ago
parent
f06449a0fd
commit
6a2c375c8e
7 changed files with 165 additions and 235 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
  2. 29
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml.cs
  3. 167
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceViewModel.cs
  4. 4
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
  5. 14
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml.cs
  6. 159
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
  7. 11
      src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebServicesView.cs

2
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
Unescape View File

@ -129,7 +129,7 @@
<TextBlock Text="{Binding ServiceDescriptionMessage}"></TextBlock> <TextBlock Text="{Binding ServiceDescriptionMessage}"></TextBlock>
</Border> </Border>
<TextBlock Grid.Row="6" Text="NameSpace:" Margin="4,0,4,0" VerticalAlignment="Bottom"></TextBlock> <TextBlock Grid.Row="6" Text="Namespace:" Margin="4,0,4,0" VerticalAlignment="Bottom"></TextBlock>
<TextBox Grid.Row="7" Grid.ColumnSpan="3" <TextBox Grid.Row="7" Grid.ColumnSpan="3"
Margin="4" Background="White" Margin="4" Background="White"
Text="{Binding DefaultNameSpace}"> Text="{Binding DefaultNameSpace}">

29
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml.cs
Unescape View File

@ -1,28 +1,12 @@
/* // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
* Created by SharpDevelop. // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
* User: Peter Forstmeier
* Date: 12.10.2011
* Time: 19:24
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference;
namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{ {
/// <summary>
/// Interaction logic for AddServiceReferenceDialog.xaml
/// </summary>
public partial class AddServiceReferenceDialog : Window public partial class AddServiceReferenceDialog : Window
{ {
public AddServiceReferenceDialog() public AddServiceReferenceDialog()
@ -30,7 +14,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
InitializeComponent(); InitializeComponent();
} }
void okButtonClick(object sender, RoutedEventArgs e) void okButtonClick(object sender, RoutedEventArgs e)
{ {
this.DialogResult = true; this.DialogResult = true;
@ -43,17 +26,15 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
Close(); Close();
} }
void Cbo_LostFocus(object sender, RoutedEventArgs e) void Cbo_LostFocus(object sender, RoutedEventArgs e)
{ {
var comboBox = (ComboBox) sender; var comboBox = (ComboBox)sender;
if(comboBox.SelectedItem != null) if (comboBox.SelectedItem != null)
return; return;
var newItem = comboBox.Text; var newItem = comboBox.Text;
comboBox.SelectedItem = newItem; comboBox.SelectedItem = newItem;
} }
void Tree_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e) void Tree_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
{ {
if (e.NewValue != null) { if (e.NewValue != null) {

167
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceViewModel.cs
Unescape View File

@ -40,11 +40,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
string serviceDescriptionMessage; string serviceDescriptionMessage;
string namespacePrefix = String.Empty; string namespacePrefix = String.Empty;
private ObservableCollection<ImageAndDescription> twoValues; ObservableCollection<ImageAndDescription> twoValues;
private List<string> mruServices = new List<string>(); List<string> mruServices = new List<string>();
private string selectedService; string selectedService;
private IProject project; IProject project;
List<ServiceItem> items = new List <ServiceItem>(); List<ServiceItem> items = new List <ServiceItem>();
ServiceItem myItem; ServiceItem myItem;
@ -59,72 +59,68 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
delegate void DiscoveredWebServicesHandler(DiscoveryClientProtocol protocol); delegate void DiscoveredWebServicesHandler(DiscoveryClientProtocol protocol);
delegate void AuthenticationHandler(Uri uri, string authenticationType); delegate void AuthenticationHandler(Uri uri, string authenticationType);
public AddServiceReferenceViewModel(IProject project) public AddServiceReferenceViewModel(IProject project)
{ {
this.project = project; this.project = project;
discoverButtonContend = "Disvover"; discoverButtonContent = "Discover";
HeadLine = header1 + header2; HeadLine = header1 + header2;
MruServices = ServiceReferenceHelper.AddMruList(); MruServices = ServiceReferenceHelper.AddMruList();
SelectedService = MruServices[0]; SelectedService = MruServices[0];
GoCommand = new RelayCommand(ExecuteGo,CanExecuteGo); GoCommand = new RelayCommand(ExecuteGo, CanExecuteGo);
DiscoverCommand = new RelayCommand(ExecuteDiscover,CanExecuteDiscover); DiscoverCommand = new RelayCommand(ExecuteDiscover, CanExecuteDiscover);
AdvancedDialogCommand = new RelayCommand(ExecuteAdvancedDialogCommand,CanExecuteAdvancedDialogCommand); AdvancedDialogCommand = new RelayCommand(ExecuteAdvancedDialogCommand, CanExecuteAdvancedDialogCommand);
TwoValues = new ObservableCollection<ImageAndDescription>(); TwoValues = new ObservableCollection<ImageAndDescription>();
} }
#region Go Command #region Go Command
public System.Windows.Input.ICommand GoCommand {get; private set;} public System.Windows.Input.ICommand GoCommand { get; private set; }
private void ExecuteGo () void ExecuteGo()
{ {
if (String.IsNullOrEmpty(SelectedService)) { if (String.IsNullOrEmpty(SelectedService)) {
MessageBox.Show (noUrl); MessageBox.Show(noUrl);
} }
ServiceDescriptionMessage = waitMessage; ServiceDescriptionMessage = waitMessage;
Uri uri = new Uri(SelectedService); Uri uri = new Uri(SelectedService);
StartDiscovery(uri, new DiscoveryNetworkCredential(CredentialCache.DefaultNetworkCredentials, DiscoveryNetworkCredential.DefaultAuthenticationType)); StartDiscovery(uri, new DiscoveryNetworkCredential(CredentialCache.DefaultNetworkCredentials, DiscoveryNetworkCredential.DefaultAuthenticationType));
} }
bool CanExecuteGo()
private bool CanExecuteGo()
{ {
return true; return true;
} }
#endregion #endregion
#region Discover Command #region Discover Command
public System.Windows.Input.ICommand DiscoverCommand {get;private set;} public System.Windows.Input.ICommand DiscoverCommand { get; private set; }
private bool CanExecuteDiscover () bool CanExecuteDiscover()
{ {
return true; return true;
} }
private void ExecuteDiscover () void ExecuteDiscover()
{ {
MessageBox.Show ("<Discover> is not implemented at the Moment"); MessageBox.Show("<Discover> is not implemented at the Moment");
} }
#endregion #endregion
#region AdvancedDialogCommand #region AdvancedDialogCommand
public System.Windows.Input.ICommand AdvancedDialogCommand {get;private set;} public System.Windows.Input.ICommand AdvancedDialogCommand { get; private set; }
private bool CanExecuteAdvancedDialogCommand () bool CanExecuteAdvancedDialogCommand()
{ {
return true; return true;
} }
private void ExecuteAdvancedDialogCommand () void ExecuteAdvancedDialogCommand()
{ {
var vm = new AdvancedServiceViewModel(); var vm = new AdvancedServiceViewModel();
var view = new AdvancedServiceDialog(); var view = new AdvancedServiceDialog();
@ -134,7 +130,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
#endregion #endregion
#region discover service Code from Matt #region discover service Code from Matt
void StartDiscovery(Uri uri, DiscoveryNetworkCredential credential) void StartDiscovery(Uri uri, DiscoveryNetworkCredential credential)
@ -155,7 +150,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
/// completed. /// completed.
/// </summary> /// </summary>
/// ///
void DiscoveryCompleted(IAsyncResult result) void DiscoveryCompleted(IAsyncResult result)
{ {
AsyncDiscoveryState state = (AsyncDiscoveryState)result.AsyncState; AsyncDiscoveryState state = (AsyncDiscoveryState)result.AsyncState;
@ -189,7 +183,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
} }
} }
/// <summary> /// <summary>
/// Stops any outstanding asynchronous discovery requests. /// Stops any outstanding asynchronous discovery requests.
/// </summary> /// </summary>
@ -211,7 +204,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
} }
} }
void AuthenticateUser(Uri uri, string authenticationType) void AuthenticateUser(Uri uri, string authenticationType)
{ {
DiscoveryNetworkCredential credential = (DiscoveryNetworkCredential)credentialCache.GetCredential(uri, authenticationType); DiscoveryNetworkCredential credential = (DiscoveryNetworkCredential)credentialCache.GetCredential(uri, authenticationType);
@ -226,7 +218,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
} }
} }
void AddCredential(Uri uri, DiscoveryNetworkCredential credential) void AddCredential(Uri uri, DiscoveryNetworkCredential credential)
{ {
NetworkCredential matchedCredential = credentialCache.GetCredential(uri, credential.AuthenticationType); NetworkCredential matchedCredential = credentialCache.GetCredential(uri, credential.AuthenticationType);
@ -236,7 +227,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
credentialCache.Add(uri, credential.AuthenticationType, credential); credentialCache.Add(uri, credential.AuthenticationType, credential);
} }
void DiscoveredWebServices(DiscoveryClientProtocol protocol) void DiscoveredWebServices(DiscoveryClientProtocol protocol)
{ {
if (protocol != null) { if (protocol != null) {
@ -247,8 +237,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
serviceDescriptionCollection.Count, serviceDescriptionCollection.Count,
discoveryUri); discoveryUri);
DefaultNameSpace = GetDefaultNamespace(); DefaultNameSpace = GetDefaultNamespace();
FillItems (serviceDescriptionCollection); FillItems(serviceDescriptionCollection);
var referenceName = ServiceReferenceHelper.GetReferenceName(discoveryUri); string referenceName = ServiceReferenceHelper.GetReferenceName(discoveryUri);
} }
} }
@ -269,84 +259,85 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
public string Title public string Title
{ {
get {return title;} get { return title; }
set {title = value; set {
base.RaisePropertyChanged(() =>Title); title = value;
base.RaisePropertyChanged(() => Title);
} }
} }
public string HeadLine { get; set; }
public string HeadLine {get; set;} string discoverButtonContent;
private string discoverButtonContend;
public string DiscoverButtonContend { public string DiscoverButtonContent {
get { return discoverButtonContend; } get { return discoverButtonContent; }
set { discoverButtonContend = value; set {
base.RaisePropertyChanged(() =>DiscoverButtonContend);} discoverButtonContent = value;
base.RaisePropertyChanged(() => DiscoverButtonContent);
}
} }
public List<string> MruServices { public List<string> MruServices {
get { get { return mruServices; }
return mruServices; } set {
set { mruServices = value; mruServices = value;
base.RaisePropertyChanged(() =>MruServices); base.RaisePropertyChanged(() => MruServices);
} }
} }
public string SelectedService { public string SelectedService {
get { return selectedService; } get { return selectedService; }
set { selectedService = value; set {
base.RaisePropertyChanged(() =>SelectedService);} selectedService = value;
base.RaisePropertyChanged(() => SelectedService);
}
} }
public List <ServiceItem> ServiceItems { public List <ServiceItem> ServiceItems {
get {return items; } get { return items; }
set { set {
items = value; items = value;
base.RaisePropertyChanged(() =>ServiceItems); base.RaisePropertyChanged(() => ServiceItems);
} }
} }
public ServiceItem ServiceItem { public ServiceItem ServiceItem {
get { return myItem; } get { return myItem; }
set { myItem = value; set {
myItem = value;
UpdateListView(); UpdateListView();
base.RaisePropertyChanged(() =>ServiceItem); base.RaisePropertyChanged(() => ServiceItem);
} }
} }
public string ServiceDescriptionMessage { public string ServiceDescriptionMessage {
get { return serviceDescriptionMessage; } get { return serviceDescriptionMessage; }
set { serviceDescriptionMessage = value; set {
base.RaisePropertyChanged(() =>ServiceDescriptionMessage); serviceDescriptionMessage = value;
base.RaisePropertyChanged(() => ServiceDescriptionMessage);
} }
} }
public string DefaultNameSpace { public string DefaultNameSpace {
get { return defaultNameSpace; } get { return defaultNameSpace; }
set { defaultNameSpace = value; set {
base.RaisePropertyChanged(() =>DefaultNameSpace);} defaultNameSpace = value;
base.RaisePropertyChanged(() => DefaultNameSpace);
}
} }
public ObservableCollection<ImageAndDescription> TwoValues { public ObservableCollection<ImageAndDescription> TwoValues {
get { return twoValues; } get { return twoValues; }
set { set {
twoValues = value; twoValues = value;
base.RaisePropertyChanged(() =>TwoValues); base.RaisePropertyChanged(() => TwoValues);
} }
} }
//http://mikehadlow.blogspot.com/2006/06/simple-wsdl-object.html //http://mikehadlow.blogspot.com/2006/06/simple-wsdl-object.html
void UpdateListView () void UpdateListView()
{ {
ServiceDescription desc = null; ServiceDescription desc = null;
TwoValues.Clear(); TwoValues.Clear();
@ -355,41 +346,35 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
var tv = new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"), var tv = new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"),
desc.RetrievalUrl); desc.RetrievalUrl);
TwoValues.Add(tv); TwoValues.Add(tv);
} } else if(ServiceItem.Tag is PortType) {
else if(ServiceItem.Tag is PortType)
{
PortType portType = (PortType)ServiceItem.Tag; PortType portType = (PortType)ServiceItem.Tag;
foreach (Operation op in portType.Operations) foreach (Operation op in portType.Operations) {
{
TwoValues.Add(new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Method"), TwoValues.Add(new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Method"),
op.Name)); op.Name));
} }
} }
} }
void FillItems(ServiceDescriptionCollection descriptions)
void FillItems (ServiceDescriptionCollection descriptions)
{ {
foreach (ServiceDescription element in descriptions) foreach(ServiceDescription element in descriptions) {
{ Add(element);
Add (element);
} }
} }
void Add(ServiceDescription description) void Add(ServiceDescription description)
{ {
List<ServiceItem> items = new List<ServiceItem>(); List<ServiceItem> items = new List<ServiceItem>();
var name = ServiceReferenceHelper.GetServiceName(description); var name = ServiceReferenceHelper.GetServiceName(description);
var rootNode = new ServiceItem(null,name); var rootNode = new ServiceItem(null, name);
rootNode.Tag = description; rootNode.Tag = description;
foreach(Service service in description.Services) { foreach(Service service in description.Services) {
var serviceNode = new ServiceItem(null,service.Name); var serviceNode = new ServiceItem(null, service.Name);
serviceNode.Tag = service; serviceNode.Tag = service;
items.Add(serviceNode); items.Add(serviceNode);
foreach (PortType portType in description.PortTypes) { foreach (PortType portType in description.PortTypes) {
var portNode = new ServiceItem(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"),portType.Name); var portNode = new ServiceItem(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"), portType.Name);
portNode.Tag = portType; portNode.Tag = portType;
serviceNode.SubItems.Add(portNode); serviceNode.SubItems.Add(portNode);
} }
@ -406,43 +391,39 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
} }
} }
public class ImageAndDescription public class ImageAndDescription
{ {
public ImageAndDescription(BitmapSource bitmapSource,string description) public ImageAndDescription(BitmapSource bitmapSource, string description)
{ {
Image = bitmapSource; Image = bitmapSource;
Description = description; Description = description;
} }
public BitmapSource Image {get;set;} public BitmapSource Image { get; set; }
public string Description {get;set;} public string Description { get; set; }
} }
public class ServiceItem : ImageAndDescription
public class ServiceItem:ImageAndDescription
{ {
public ServiceItem (BitmapSource bitmapSource,string description):base(bitmapSource,description) public ServiceItem(BitmapSource bitmapSource, string description) : base(bitmapSource, description)
{ {
SubItems = new List<ServiceItem>(); SubItems = new List<ServiceItem>();
} }
public object Tag {get;set;} public object Tag { get; set; }
public List<ServiceItem> SubItems {get;set;} public List<ServiceItem> SubItems { get; set; }
} }
public class CheckableImageAndDescription :ImageAndDescription public class CheckableImageAndDescription : ImageAndDescription
{ {
public CheckableImageAndDescription(BitmapSource bitmapSource,string description):base(bitmapSource,description) public CheckableImageAndDescription(BitmapSource bitmapSource, string description) : base(bitmapSource, description)
{ {
} }
private bool itemChecked; bool itemChecked;
public bool ItemChecked { public bool ItemChecked {
get { return itemChecked; } get { return itemChecked; }
set { itemChecked = value;} set { itemChecked = value; }
// base.RaisePropertyChanged(() =>IsChecked);} // base.RaisePropertyChanged(() =>IsChecked);}
} }

4
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
Unescape View File

@ -43,7 +43,7 @@
Text="{Binding AccessLevel}"></TextBlock> Text="{Binding AccessLevel}"></TextBlock>
<ComboBox <ComboBox
Grid.Column="1 " Margin="4" Grid.Column="1 " Margin="4"
gui:EnumBinding.EnumType="{x:Type local:Modifyers}" SelectedValue="{Binding SelectedModifyer}"> gui:EnumBinding.EnumType="{x:Type local:Modifiers}" SelectedValue="{Binding SelectedModifier}">
</ComboBox> </ComboBox>
<CheckBox <CheckBox
@ -83,7 +83,7 @@
Margin="25,0,0,0" Margin="25,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
IsChecked="{Binding GenerateMessageContract}" IsChecked="{Binding GenerateMessageContract}"
Content="Allways generate message contracts"></CheckBox> Content="Always generate message contracts"></CheckBox>
<TextBlock <TextBlock
Margin="25,0,0,0" Margin="25,0,0,0"
Grid.Row="1" Grid.Row="1"

14
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml.cs
Unescape View File

@ -1,11 +1,6 @@
/* // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
* Created by SharpDevelop. // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
* User: Peter Forstmeier
* Date: 02.11.2011
* Time: 19:49
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
@ -18,9 +13,6 @@ using System.Windows.Media;
namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{ {
/// <summary>
/// Interaction logic for AdvancedServiceDialog.xaml
/// </summary>
public partial class AdvancedServiceDialog : Window public partial class AdvancedServiceDialog : Window
{ {
public AdvancedServiceDialog() public AdvancedServiceDialog()

159
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
Unescape View File

@ -1,25 +1,17 @@
/* // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
* Created by SharpDevelop. // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
* User: Peter Forstmeier
* Date: 02.11.2011
* Time: 19:50
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Windows.Media.Imaging;
using ICSharpCode.Core.Presentation; using ICSharpCode.Core.Presentation;
using ICSharpCode.SharpDevelop.Widgets; using ICSharpCode.SharpDevelop.Widgets;
namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{ {
/// <summary> public enum Modifiers
/// Description of AdvancedServiceViewModel.
/// </summary>
///
public enum Modifyers
{ {
//[Description("${res:Dialog.ProjectOptions.RunPostBuildEvent.Always}")] //[Description("${res:Dialog.ProjectOptions.RunPostBuildEvent.Always}")]
Public, Public,
@ -58,145 +50,132 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
OrderedDictionary OrderedDictionary
} }
internal class AdvancedServiceViewModel : ViewModelBase
internal class AdvancedServiceViewModel:ViewModelBase
{ {
private string compatibilityText ="Add a web Reference instead of a Service Reference. "; string compatibilityText = "Add a Web Reference instead of a Service Reference. ";
private string c_2 ="thios will generate code base on .NET Framework 2.0 Web services technology"; string c_2 = "This will generate code based on .NET Framework 2.0 Web Services technology.";
private string accesslevel = "Access level for generated classes:"; string accesslevel = "Access level for generated classes:";
public AdvancedServiceViewModel() public AdvancedServiceViewModel()
{ {
Title ="Service Reference Settings"; Title ="Service Reference Settings";
UseReferencedAssemblies = true; UseReferencedAssemblies = true;
var image = PresentationResourceService.GetBitmapSource("Icons.16x16.Reference"); BitmapSource image = PresentationResourceService.GetBitmapSource("Icons.16x16.Reference");
AssembliesToReference = new ObservableCollection <CheckableImageAndDescription>(); AssembliesToReference = new ObservableCollection<CheckableImageAndDescription>();
AssembliesToReference.Add(new CheckableImageAndDescription(image,"Microsoft.CSharp")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "Microsoft.CSharp"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"mscorlib")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "mscorlib"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Core")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Core"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Data")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Data"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Data.DataSetExtensions")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Data.DataSetExtensions"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Runtime.Serialization")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Runtime.Serialization"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.ServiceModel")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.ServiceModel"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Xml")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Xml"));
AssembliesToReference.Add(new CheckableImageAndDescription(image,"System.Xml.Linq")); AssembliesToReference.Add(new CheckableImageAndDescription(image, "System.Xml.Linq"));
} }
public string Title {get;set;} public string Title { get; set; }
public string AccessLevel { public string AccessLevel {
get {return accesslevel;} get { return accesslevel; }
} }
private Modifyers selectedModifyer; Modifiers selectedModifier;
public Modifyers SelectedModifyer { public Modifiers SelectedModifier {
get { return selectedModifyer; } get { return selectedModifier; }
set { selectedModifyer = value; set {
base.RaisePropertyChanged(() =>SelectedModifyer); } selectedModifier = value;
base.RaisePropertyChanged(() => SelectedModifier);
}
} }
bool generateAsyncOperations; bool generateAsyncOperations;
public bool GenerateAsyncOperations { public bool GenerateAsyncOperations {
get { return generateAsyncOperations; } get { return generateAsyncOperations; }
set { generateAsyncOperations = value; set {
base.RaisePropertyChanged(() =>GenerateAsyncOperations);} generateAsyncOperations = value;
base.RaisePropertyChanged(() => GenerateAsyncOperations);
}
} }
bool generateMessageContract; bool generateMessageContract;
public bool GenerateMessageContract { public bool GenerateMessageContract {
get { return generateMessageContract; } get { return generateMessageContract; }
set { generateMessageContract = value; set {
base.RaisePropertyChanged(() =>GenerateMessageContract);} generateMessageContract = value;
base.RaisePropertyChanged(() => GenerateMessageContract);
}
} }
CollectionTypes collectionType;
private CollectionTypes collectionType;
public CollectionTypes CollectionType { public CollectionTypes CollectionType {
get { return collectionType; } get { return collectionType; }
set { collectionType = value; set {
base.RaisePropertyChanged(() =>CollectionType);} collectionType = value;
base.RaisePropertyChanged(() => CollectionType);
}
} }
private DictionaryCollectionTypes dictionaryCollectionType; DictionaryCollectionTypes dictionaryCollectionType;
public DictionaryCollectionTypes DictionaryCollectionType { public DictionaryCollectionTypes DictionaryCollectionType {
get { return dictionaryCollectionType; } get { return dictionaryCollectionType; }
set { dictionaryCollectionType = value; set {
base.RaisePropertyChanged(() =>DictionaryCollectionType);} dictionaryCollectionType = value;
base.RaisePropertyChanged(() => DictionaryCollectionType);
}
} }
bool useReferencedAssemblies;
private bool useReferencedAssemblies;
public bool UseReferencedAssemblies { public bool UseReferencedAssemblies {
get { return useReferencedAssemblies; } get { return useReferencedAssemblies; }
set { useReferencedAssemblies = value; set {
if (useReferencedAssemblies) { useReferencedAssemblies = value;
ReuseTypes = true; ReuseTypes = useReferencedAssemblies;
base.RaisePropertyChanged(() => UseReferencedAssemblies);
} }
else {
ReuseTypes = false;
} }
base.RaisePropertyChanged(() =>UseReferencedAssemblies);}
}
private bool reuseTypes; bool reuseTypes;
public bool ReuseTypes { public bool ReuseTypes {
get { return reuseTypes; } get { return reuseTypes; }
set { reuseTypes = value; set {
if (reuseTypes) { reuseTypes = value;
base.RaisePropertyChanged(() => ReuseTypes);
} }
else
{
} }
base.RaisePropertyChanged(() =>ReuseTypes);}
}
private bool reuseReferencedTypes; bool reuseReferencedTypes;
public bool ReuseReferencedTypes { public bool ReuseReferencedTypes {
get { return reuseReferencedTypes; } get { return reuseReferencedTypes; }
set { reuseReferencedTypes = value; set {
if (reuseReferencedTypes) reuseReferencedTypes = value;
{ ListViewEnable = value;
ListViewEnable = true; base.RaisePropertyChanged(() => ReuseReferencedTypes);
} else
{
ListViewEnable = false;
} }
base.RaisePropertyChanged(() => ReuseReferencedTypes);}
} }
bool listViewEnable;
private bool listViewEnable;
public bool ListViewEnable { public bool ListViewEnable {
get { return listViewEnable; } get { return listViewEnable; }
set { listViewEnable = value; set {
base.RaisePropertyChanged(() => ListViewEnable);} listViewEnable = value;
base.RaisePropertyChanged(() => ListViewEnable);
}
} }
public ObservableCollection <CheckableImageAndDescription> AssembliesToReference { get; private set; }
public ObservableCollection <CheckableImageAndDescription> AssembliesToReference {get;private set;}
public string CompatibilityText public string CompatibilityText
{ {
get { get { return compatibilityText + c_2; }
return compatibilityText + c_2;
}
} }
} }
} }

11
src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/WebServicesView.cs
Unescape View File

@ -139,21 +139,19 @@ namespace ICSharpCode.SharpDevelop.Gui
ListViewItem item; ListViewItem item;
webServicesListView.Items.Clear(); webServicesListView.Items.Clear();
if(e.Node.Tag is ServiceDescription) { if (e.Node.Tag is ServiceDescription) {
ServiceDescription desc = (ServiceDescription)e.Node.Tag; ServiceDescription desc = (ServiceDescription)e.Node.Tag;
item = new ListViewItem(); item = new ListViewItem();
item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.RetrievalUriProperty}"); item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.RetrievalUriProperty}");
item.SubItems.Add(desc.RetrievalUrl); item.SubItems.Add(desc.RetrievalUrl);
webServicesListView.Items.Add(item); webServicesListView.Items.Add(item);
} } else if(e.Node.Tag is Service) {
else if(e.Node.Tag is Service) {
Service service = (Service)e.Node.Tag; Service service = (Service)e.Node.Tag;
item = new ListViewItem(); item = new ListViewItem();
item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.DocumentationProperty}"); item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.DocumentationProperty}");
item.SubItems.Add(service.Documentation); item.SubItems.Add(service.Documentation);
webServicesListView.Items.Add(item); webServicesListView.Items.Add(item);
} } else if(e.Node.Tag is Port) {
else if(e.Node.Tag is Port) {
Port port = (Port)e.Node.Tag; Port port = (Port)e.Node.Tag;
item = new ListViewItem(); item = new ListViewItem();
@ -170,8 +168,7 @@ namespace ICSharpCode.SharpDevelop.Gui
item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.ServiceNameProperty}"); item.Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.Dialogs.AddWebReferenceDialog.ServiceNameProperty}");
item.SubItems.Add(port.Service.Name); item.SubItems.Add(port.Service.Name);
webServicesListView.Items.Add(item); webServicesListView.Items.Add(item);
} } else if(e.Node.Tag is Operation) {
else if(e.Node.Tag is Operation) {
Operation operation = (Operation)e.Node.Tag; Operation operation = (Operation)e.Node.Tag;
item = new ListViewItem(); item = new ListViewItem();

Write Preview
Loading…
Cancel
Save