Skip to content

Commit

Permalink
Fix #6593.
Browse files Browse the repository at this point in the history
Former-commit-id: 5aa5507af45a410ece390c415308064efe7155d7
  • Loading branch information
ylangisc committed Oct 8, 2012
1 parent 17b72b1 commit 470e220
Show file tree
Hide file tree
Showing 8 changed files with 939 additions and 868 deletions.
12 changes: 12 additions & 0 deletions source/ch/cyberduck/Cyberduck.csproj
Expand Up @@ -202,6 +202,8 @@
<Compile Include="core\Utils.cs" />
<Compile Include="core\VirtualFileDataObject.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ui\controller\ICreateSymlinkPromptView.cs" />
<Compile Include="ui\controller\CreateSymlinkController.cs" />
<Compile Include="ui\controller\GotoController.cs" />
<Compile Include="ui\controller\IGotoPromptView.cs" />
<Compile Include="ui\controller\IUpdateView.cs" />
Expand Down Expand Up @@ -235,6 +237,12 @@
<Compile Include="ui\winforms\controls\VistaMenuOwnerDrawn.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ui\winforms\CreateSymlinkPromptForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ui\winforms\CreateSymlinkPromptForm.Designer.cs">
<DependentUpon>CreateSymlinkPromptForm.cs</DependentUpon>
</Compile>
<Compile Include="ui\winforms\GotoPromptForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -283,6 +291,10 @@
<DependentUpon>TransferControl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ui\winforms\CreateSymlinkPromptForm.resx">
<DependentUpon>CreateSymlinkPromptForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ui\winforms\CreateFilePromptForm.resx">
<DependentUpon>CreateFilePromptForm.cs</DependentUpon>
<SubType>Designer</SubType>
Expand Down
50 changes: 25 additions & 25 deletions source/ch/cyberduck/core/StructureMapBootstrapper.cs
@@ -1,5 +1,5 @@
//
// Copyright (c) 2010-2011 Yves Langisch. All rights reserved.
// Copyright (c) 2010-2012 Yves Langisch. All rights reserved.
// http://cyberduck.ch/
//
// This program is free software; you can redistribute it and/or modify
Expand All @@ -19,7 +19,6 @@
using Ch.Cyberduck.Ui.Controller;
using Ch.Cyberduck.Ui.Winforms;
using Ch.Cyberduck.Ui.Winforms.Controls;
using Ch.Cyberduck.ui.winforms;
using StructureMap;

namespace Ch.Cyberduck.Core
Expand All @@ -31,33 +30,34 @@ public class StructureMapBootstrapper : IBootstrapper
public void BootstrapStructureMap()
{
ObjectFactory.Initialize(x =>
{
x.For<IBrowserView>().Use<BrowserForm>();
x.For<IInfoView>().Use<InfoForm>();
x.For<IActivityView>().Use<ActivityForm>();
x.For<ILoginView>().Use<LoginForm>();
x.For<IBookmarkView>().Use<BookmarkForm>();
x.For<IConnectionView>().Use<ConnectionForm>();
x.For<ITransferPromptView>().Use<TransferPromptForm>();
x.For<IErrorView>().Use<ErrorForm>();
{
x.For<IBrowserView>().Use<BrowserForm>();
x.For<IInfoView>().Use<InfoForm>();
x.For<IActivityView>().Use<ActivityForm>();
x.For<ILoginView>().Use<LoginForm>();
x.For<IBookmarkView>().Use<BookmarkForm>();
x.For<IConnectionView>().Use<ConnectionForm>();
x.For<ITransferPromptView>().Use<TransferPromptForm>();
x.For<IErrorView>().Use<ErrorForm>();
// Singletons
x.For<INewFolderPromptView>().Singleton().Use<NewFolderPromptForm>();
x.For<ICreateFilePromptView>().Singleton().Use<CreateFilePromptForm>();
x.For<IGotoPromptView>().Singleton().Use<GotoPromptForm>();
x.For<IDuplicateFilePromptView>().Singleton().Use<DuplicateFilePromptForm>();
x.For<IPreferencesView>().Singleton().Use<PreferencesForm>();
x.For<IDonationView>().Singleton().Use<DonationForm>();
// Singletons
x.For<INewFolderPromptView>().Singleton().Use<NewFolderPromptForm>();
x.For<ICreateFilePromptView>().Singleton().Use<CreateFilePromptForm>();
x.For<ICreateSymlinkPromptView>().Singleton().Use<CreateSymlinkPromptForm>();
x.For<IGotoPromptView>().Singleton().Use<GotoPromptForm>();
x.For<IDuplicateFilePromptView>().Singleton().Use<DuplicateFilePromptForm>();
x.For<IPreferencesView>().Singleton().Use<PreferencesForm>();
x.For<IDonationView>().Singleton().Use<DonationForm>();
// might be a singleton
x.For<IUpdateView>().Use<UpdateForm>();
// might be a singleton
x.For<IUpdateView>().Use<UpdateForm>();
//x.For<ITransferView>().TheDefault.Is.Object(MockRepository.GenerateMock<ITransferView>());
//x.For<IProgressView>().TheDefault.Is.Object(MockRepository.GenerateMock<IProgressView>());
//x.For<ITransferView>().TheDefault.Is.Object(MockRepository.GenerateMock<ITransferView>());
//x.For<IProgressView>().TheDefault.Is.Object(MockRepository.GenerateMock<IProgressView>());
x.For<ITransferView>().Use<TransferForm>();
x.For<IProgressView>().Use<TransferControl>();
});
x.For<ITransferView>().Use<TransferForm>();
x.For<IProgressView>().Use<TransferControl>();
});
}

public static void Restart()
Expand Down

0 comments on commit 470e220

Please sign in to comment.