|
|
|
@ -40,11 +40,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -40,11 +40,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
string serviceDescriptionMessage; |
|
|
|
|
string namespacePrefix = String.Empty; |
|
|
|
|
|
|
|
|
|
private ObservableCollection<ImageAndDescription> twoValues; |
|
|
|
|
ObservableCollection<ImageAndDescription> twoValues; |
|
|
|
|
|
|
|
|
|
private List<string> mruServices = new List<string>(); |
|
|
|
|
private string selectedService; |
|
|
|
|
private IProject project; |
|
|
|
|
List<string> mruServices = new List<string>(); |
|
|
|
|
string selectedService; |
|
|
|
|
IProject project; |
|
|
|
|
|
|
|
|
|
List<ServiceItem> items = new List <ServiceItem>(); |
|
|
|
|
ServiceItem myItem; |
|
|
|
@ -59,11 +59,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -59,11 +59,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
delegate void DiscoveredWebServicesHandler(DiscoveryClientProtocol protocol); |
|
|
|
|
delegate void AuthenticationHandler(Uri uri, string authenticationType); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public AddServiceReferenceViewModel(IProject project) |
|
|
|
|
{ |
|
|
|
|
this.project = project; |
|
|
|
|
discoverButtonContend = "Disvover"; |
|
|
|
|
discoverButtonContent = "Discover"; |
|
|
|
|
HeadLine = header1 + header2; |
|
|
|
|
|
|
|
|
|
MruServices = ServiceReferenceHelper.AddMruList(); |
|
|
|
@ -75,12 +74,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -75,12 +74,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
TwoValues = new ObservableCollection<ImageAndDescription>(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#region Go Command
|
|
|
|
|
|
|
|
|
|
public System.Windows.Input.ICommand GoCommand { get; private set; } |
|
|
|
|
|
|
|
|
|
private void ExecuteGo () |
|
|
|
|
void ExecuteGo() |
|
|
|
|
{ |
|
|
|
|
if (String.IsNullOrEmpty(SelectedService)) { |
|
|
|
|
MessageBox.Show(noUrl); |
|
|
|
@ -90,25 +88,23 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -90,25 +88,23 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
StartDiscovery(uri, new DiscoveryNetworkCredential(CredentialCache.DefaultNetworkCredentials, DiscoveryNetworkCredential.DefaultAuthenticationType)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private bool CanExecuteGo() |
|
|
|
|
bool CanExecuteGo() |
|
|
|
|
{ |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#region Discover Command
|
|
|
|
|
|
|
|
|
|
public System.Windows.Input.ICommand DiscoverCommand { get; private set; } |
|
|
|
|
|
|
|
|
|
private bool CanExecuteDiscover () |
|
|
|
|
bool CanExecuteDiscover() |
|
|
|
|
{ |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void ExecuteDiscover () |
|
|
|
|
void ExecuteDiscover() |
|
|
|
|
{ |
|
|
|
|
MessageBox.Show("<Discover> is not implemented at the Moment"); |
|
|
|
|
} |
|
|
|
@ -119,12 +115,12 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -119,12 +115,12 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
|
|
|
|
|
public System.Windows.Input.ICommand AdvancedDialogCommand { get; private set; } |
|
|
|
|
|
|
|
|
|
private bool CanExecuteAdvancedDialogCommand () |
|
|
|
|
bool CanExecuteAdvancedDialogCommand() |
|
|
|
|
{ |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void ExecuteAdvancedDialogCommand () |
|
|
|
|
void ExecuteAdvancedDialogCommand() |
|
|
|
|
{ |
|
|
|
|
var vm = new AdvancedServiceViewModel(); |
|
|
|
|
var view = new AdvancedServiceDialog(); |
|
|
|
@ -134,7 +130,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -134,7 +130,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#region discover service Code from Matt
|
|
|
|
|
|
|
|
|
|
void StartDiscovery(Uri uri, DiscoveryNetworkCredential credential) |
|
|
|
@ -155,7 +150,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -155,7 +150,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
/// completed.
|
|
|
|
|
/// </summary>
|
|
|
|
|
///
|
|
|
|
|
|
|
|
|
|
void DiscoveryCompleted(IAsyncResult result) |
|
|
|
|
{ |
|
|
|
|
AsyncDiscoveryState state = (AsyncDiscoveryState)result.AsyncState; |
|
|
|
@ -189,7 +183,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -189,7 +183,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Stops any outstanding asynchronous discovery requests.
|
|
|
|
|
/// </summary>
|
|
|
|
@ -211,7 +204,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -211,7 +204,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void AuthenticateUser(Uri uri, string authenticationType) |
|
|
|
|
{ |
|
|
|
|
DiscoveryNetworkCredential credential = (DiscoveryNetworkCredential)credentialCache.GetCredential(uri, authenticationType); |
|
|
|
@ -226,7 +218,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -226,7 +218,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void AddCredential(Uri uri, DiscoveryNetworkCredential credential) |
|
|
|
|
{ |
|
|
|
|
NetworkCredential matchedCredential = credentialCache.GetCredential(uri, credential.AuthenticationType); |
|
|
|
@ -236,7 +227,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -236,7 +227,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
credentialCache.Add(uri, credential.AuthenticationType, credential); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void DiscoveredWebServices(DiscoveryClientProtocol protocol) |
|
|
|
|
{ |
|
|
|
|
if (protocol != null) { |
|
|
|
@ -248,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -248,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
discoveryUri); |
|
|
|
|
DefaultNameSpace = GetDefaultNamespace(); |
|
|
|
|
FillItems(serviceDescriptionCollection); |
|
|
|
|
var referenceName = ServiceReferenceHelper.GetReferenceName(discoveryUri); |
|
|
|
|
string referenceName = ServiceReferenceHelper.GetReferenceName(discoveryUri); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -270,38 +260,39 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -270,38 +260,39 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
public string Title |
|
|
|
|
{ |
|
|
|
|
get { return title; } |
|
|
|
|
set {title = value; |
|
|
|
|
set { |
|
|
|
|
title = value; |
|
|
|
|
base.RaisePropertyChanged(() => Title); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public string HeadLine { get; set; } |
|
|
|
|
|
|
|
|
|
private string discoverButtonContend; |
|
|
|
|
string discoverButtonContent; |
|
|
|
|
|
|
|
|
|
public string DiscoverButtonContend { |
|
|
|
|
get { return discoverButtonContend; } |
|
|
|
|
set { discoverButtonContend = value; |
|
|
|
|
base.RaisePropertyChanged(() =>DiscoverButtonContend);} |
|
|
|
|
public string DiscoverButtonContent { |
|
|
|
|
get { return discoverButtonContent; } |
|
|
|
|
set { |
|
|
|
|
discoverButtonContent = value; |
|
|
|
|
base.RaisePropertyChanged(() => DiscoverButtonContent); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<string> MruServices { |
|
|
|
|
get { |
|
|
|
|
return mruServices; } |
|
|
|
|
set { mruServices = value; |
|
|
|
|
get { return mruServices; } |
|
|
|
|
set { |
|
|
|
|
mruServices = value; |
|
|
|
|
base.RaisePropertyChanged(() => MruServices); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public string SelectedService { |
|
|
|
|
get { return selectedService; } |
|
|
|
|
set { selectedService = value; |
|
|
|
|
base.RaisePropertyChanged(() =>SelectedService);} |
|
|
|
|
set { |
|
|
|
|
selectedService = value; |
|
|
|
|
base.RaisePropertyChanged(() => SelectedService); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List <ServiceItem> ServiceItems { |
|
|
|
|
get { return items; } |
|
|
|
@ -311,30 +302,30 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -311,30 +302,30 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public ServiceItem ServiceItem { |
|
|
|
|
get { return myItem; } |
|
|
|
|
set { myItem = value; |
|
|
|
|
set { |
|
|
|
|
myItem = value; |
|
|
|
|
UpdateListView(); |
|
|
|
|
base.RaisePropertyChanged(() => ServiceItem); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public string ServiceDescriptionMessage { |
|
|
|
|
get { return serviceDescriptionMessage; } |
|
|
|
|
set { serviceDescriptionMessage = value; |
|
|
|
|
set { |
|
|
|
|
serviceDescriptionMessage = value; |
|
|
|
|
base.RaisePropertyChanged(() => ServiceDescriptionMessage); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public string DefaultNameSpace { |
|
|
|
|
get { return defaultNameSpace; } |
|
|
|
|
set { defaultNameSpace = value; |
|
|
|
|
base.RaisePropertyChanged(() =>DefaultNameSpace);} |
|
|
|
|
set { |
|
|
|
|
defaultNameSpace = value; |
|
|
|
|
base.RaisePropertyChanged(() => DefaultNameSpace); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public ObservableCollection<ImageAndDescription> TwoValues { |
|
|
|
|
get { return twoValues; } |
|
|
|
@ -355,28 +346,22 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -355,28 +346,22 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
var tv = new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"), |
|
|
|
|
desc.RetrievalUrl); |
|
|
|
|
TwoValues.Add(tv); |
|
|
|
|
} |
|
|
|
|
else if(ServiceItem.Tag is PortType) |
|
|
|
|
{ |
|
|
|
|
} else if(ServiceItem.Tag is PortType) { |
|
|
|
|
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"), |
|
|
|
|
op.Name)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void FillItems(ServiceDescriptionCollection descriptions) |
|
|
|
|
{ |
|
|
|
|
foreach (ServiceDescription element in descriptions) |
|
|
|
|
{ |
|
|
|
|
foreach(ServiceDescription element in descriptions) { |
|
|
|
|
Add(element); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void Add(ServiceDescription description) |
|
|
|
|
{ |
|
|
|
|
List<ServiceItem> items = new List<ServiceItem>(); |
|
|
|
@ -406,7 +391,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -406,7 +391,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public class ImageAndDescription |
|
|
|
|
{ |
|
|
|
|
public ImageAndDescription(BitmapSource bitmapSource, string description) |
|
|
|
@ -419,8 +403,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -419,8 +403,6 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
public string Description { get; set; } |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public class ServiceItem : ImageAndDescription |
|
|
|
|
{ |
|
|
|
|
public ServiceItem(BitmapSource bitmapSource, string description) : base(bitmapSource, description) |
|
|
|
@ -435,10 +417,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
@@ -435,10 +417,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
|
|
|
|
|
{ |
|
|
|
|
public CheckableImageAndDescription(BitmapSource bitmapSource, string description) : base(bitmapSource, description) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private bool itemChecked; |
|
|
|
|
bool itemChecked; |
|
|
|
|
|
|
|
|
|
public bool ItemChecked { |
|
|
|
|
get { return itemChecked; } |
|
|
|
|