Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/DataAccessListenerBase.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/IDataAccessListener.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/IDataAccessListenersProvider.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/IProjectRepository.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/IProjectRepositoryFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Dao/IProjectRepositoryListener.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj =================================================================== diff -u -r7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj (.../DelftTools.Shell.Core.csproj) (revision 7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b) +++ src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj (.../DelftTools.Shell.Core.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -88,9 +88,6 @@ Properties\GlobalAssembly.cs - - - @@ -111,9 +108,6 @@ - - - @@ -124,7 +118,6 @@ - Index: src/Common/DelftTools.Shell.Core/IApplication.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Core/IApplication.cs (.../IApplication.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Shell.Core/IApplication.cs (.../IApplication.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -3,8 +3,6 @@ using System.Collections.Specialized; using System.Configuration; using System.Resources; -using DelftTools.Shell.Core.Dao; -using DelftTools.Shell.Core.Services; using DelftTools.Shell.Core.Workflow; namespace DelftTools.Shell.Core @@ -64,29 +62,15 @@ /// ResourceManager Resources { get; set; } - IProjectService ProjectService { get; } - IEnumerable FileImporters { get; } IEnumerable FileExporters { get; } - IProjectRepositoryFactory ProjectRepositoryFactory { get; set; } - // TODO: hide it? - string ProjectDataDirectory { get; } - string ProjectFilePath { get; } - string Version { get; } - string PluginVersions { get; } - /// - /// In some applications only a single activity run is performed (e.g. command-line, external wrapper). - /// In this case for performance reasons synchronization this flag can be set to true. - /// - bool IsDataAccessSynchronizationDisabled { get; set; } - ApplicationPlugin GetPluginForType(Type type); /// Index: src/Common/DelftTools.Shell.Core/IProjectImporter.cs =================================================================== diff -u -r44d491f0772d64c9f11182ebf9d6793782a2fd7b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Core/IProjectImporter.cs (.../IProjectImporter.cs) (revision 44d491f0772d64c9f11182ebf9d6793782a2fd7b) +++ src/Common/DelftTools.Shell.Core/IProjectImporter.cs (.../IProjectImporter.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -1,5 +1,3 @@ -using DelftTools.Shell.Core.Services; - namespace DelftTools.Shell.Core { /// @@ -9,9 +7,5 @@ /// public interface IProjectImporter : IFileImporter { - /// - /// Project service used to open the project to import - /// - IProjectService ProjectService { set; } } } \ No newline at end of file Index: src/Common/DelftTools.Shell.Core/IProjectItemExporter.cs =================================================================== diff -u -r617ee3a431cbe007bae4877aa11bb16c5c2bdd71 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Core/IProjectItemExporter.cs (.../IProjectItemExporter.cs) (revision 617ee3a431cbe007bae4877aa11bb16c5c2bdd71) +++ src/Common/DelftTools.Shell.Core/IProjectItemExporter.cs (.../IProjectItemExporter.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -1,15 +1,9 @@ -using DelftTools.Shell.Core.Services; - namespace DelftTools.Shell.Core { /// /// Imports another project into a project. /// public interface IProjectItemExporter : IFileExporter { - /// - /// Project service used to export project - /// - IProjectService ProjectService { set; } } } \ No newline at end of file Index: src/Common/DelftTools.Shell.Core/Project.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Core/Project.cs (.../Project.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Shell.Core/Project.cs (.../Project.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -41,16 +41,6 @@ /// public IEventedList Items { get; private set; } - /// - /// True if project has changes. - /// - public bool IsChanged { get; set; } - - /// - /// True if project is temporary. - /// - public bool IsTemporary { get; set; } - # region IObservable private readonly IList observers = new List(); Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Services/IProjectService.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Common/DelftTools.Shell.Gui/IGuiCommandHandler.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Shell.Gui/IGuiCommandHandler.cs (.../IGuiCommandHandler.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Shell.Gui/IGuiCommandHandler.cs (.../IGuiCommandHandler.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -45,9 +45,6 @@ /// Whether or not the WTI project was correctly closed. bool TryCloseWTIProject(); - bool SaveProject(); - bool SaveProjectAs(); - /// /// Presents the user with a dialog to choose an editor for the selected dataitem /// Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/Common/DelftTools.Utils/Data/IObjectRepository.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/Common/DelftTools.Utils/DelftTools.Utils.csproj =================================================================== diff -u -r7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/Common/DelftTools.Utils/DelftTools.Utils.csproj (.../DelftTools.Utils.csproj) (revision 7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b) +++ src/Common/DelftTools.Utils/DelftTools.Utils.csproj (.../DelftTools.Utils.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -176,7 +176,6 @@ - Index: src/DeltaShell/DeltaShell.Core/DeltaShell.Core.csproj =================================================================== diff -u -r7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Core/DeltaShell.Core.csproj (.../DeltaShell.Core.csproj) (revision 7c96a453c2d0aca91c10b12a4bcd9441e7a6b89b) +++ src/DeltaShell/DeltaShell.Core/DeltaShell.Core.csproj (.../DeltaShell.Core.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -90,8 +90,6 @@ - - True @@ -114,7 +112,6 @@ True Settings.settings - Index: src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs =================================================================== diff -u -r4ae34e044a58f8c6d1de9fe28b60b301955106f6 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs (.../DeltaShellApplication.cs) (revision 4ae34e044a58f8c6d1de9fe28b60b301955106f6) +++ src/DeltaShell/DeltaShell.Core/DeltaShellApplication.cs (.../DeltaShellApplication.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -11,15 +11,12 @@ using System.Resources; using System.Threading; using DelftTools.Shell.Core; -using DelftTools.Shell.Core.Dao; -using DelftTools.Shell.Core.Services; using DelftTools.Shell.Core.Workflow; using DelftTools.Utils; using DelftTools.Utils.Aop; using DelftTools.Utils.Collections; using DelftTools.Utils.Globalization; using DelftTools.Utils.Reflection; -using DeltaShell.Core.Services; using log4net; namespace DeltaShell.Core @@ -31,16 +28,11 @@ // TODO: migrate into ProjectService public event Action ProjectOpening; public event Action ProjectOpened; - - // TODO: migrate into ProjectService public event Action ProjectClosing; public event Action ProjectSaving; public event Action ProjectSaveFailed; public event Action ProjectSaved; - public static bool TemporaryProjectBeingSaved; - public static bool TemporaryProjectSaved; - public static bool TemporaryProjectSavedAsynchroneously; private static readonly ILog log = LogManager.GetLogger(typeof(DeltaShellApplication)); private readonly IList fileImporters = new List(); private readonly IList fileExporters = new List(); @@ -49,10 +41,7 @@ private Project project; private DeltaShellApplicationSettings userSettings; - private IProjectService projectService; - private string defaultRepositoryTypeName; - private bool isRunning; private bool running; @@ -64,13 +53,9 @@ public DeltaShellApplication() { - ProjectRepositoryFactory = new ProjectRepositoryFactory(); - Settings = ConfigurationManager.AppSettings; UserSettings = Properties.Settings.Default; - ProjectService = new ProjectService(ProjectRepositoryFactory); - Plugins = new List(); ActivityRunner = new ActivityRunner(); @@ -85,16 +70,6 @@ UserSettings = Properties.Settings.Default; } - public PluginConfigurationLoader PluginConfigurationLoader { get; private set; } - - public string ApplicationNameAndVersion - { - get - { - return SettingsHelper.ApplicationNameAndVersion; - } - } - public bool IsProjectCreatedInTemporaryDirectory { get; set; } public string PluginVersions @@ -105,11 +80,6 @@ } } - public bool IsDataAccessSynchronizationDisabled { get; set; } - - // TODO: migrate into ProjectService - public IProjectRepositoryFactory ProjectRepositoryFactory { get; set; } - public Project Project { get @@ -127,7 +97,7 @@ ProjectClosing(project); } - ProjectService.Close(project); + CloseProject(); } if (value != null && ProjectOpening != null) @@ -165,59 +135,8 @@ public NameValueCollection Settings { get; set; } - public string Version - { - get - { - return SettingsHelper.ApplicationVersion; - /*var assemblyInfo = AssemblyUtils.GetAssemblyInfo(Assembly.GetExecutingAssembly()); - return assemblyInfo.Version;*/ - } - } + public string ProjectFilePath{ get; private set; } - // TODO: hide it - public IProjectService ProjectService - { - get - { - return projectService; - } - set - { - if (projectService != null) - { - projectService.ProjectSaving -= ProjectServiceProjectSaving; - projectService.ProjectSaved -= ProjectServiceProjectSaved; - projectService.ProjectSaveFailed -= ProjectServiceProjectSaveFailed; - } - - projectService = value; - - if (projectService != null) - { - projectService.ProjectSaving += ProjectServiceProjectSaving; - projectService.ProjectSaved += ProjectServiceProjectSaved; - projectService.ProjectSaveFailed += ProjectServiceProjectSaveFailed; - } - } - } - - public string ProjectDataDirectory - { - get - { - return projectService.ProjectDataDirectory; - } - } - - public string ProjectFilePath - { - get - { - return projectService.ProjectRepository.Path; - } - } - public IEnumerable FileImporters { get @@ -328,8 +247,6 @@ SetLanguageAndRegionalSettions(); - ProjectService = new ProjectService(); - //Disabled trace logging this causes focus bugs combined with avalon dock (KeyPreview debug messages) //InitializeLogging(); @@ -341,7 +258,6 @@ InitializePlugins(); log.Info(Properties.Resources.DeltaShellApplication_Run_Initializing_project_repository____); - InitializeProjectRepositoryFactory(); isRunning = true; @@ -359,15 +275,6 @@ log.Info(Properties.Resources.DeltaShellApplication_Run_Waiting_until_all_plugins_are_activated____); - if (!TemporaryProjectSavedAsynchroneously) - { - // wait until all plugins are activated - while (Plugins.Any(p => !p.IsActive)) - { - Thread.Sleep(250); - } - } - Project = projectBeingCreated; // opens project in application initializing = false; @@ -389,12 +296,12 @@ public void SaveProjectAs(string path) { - ProjectService.SaveProjectAs(Project, path); + // TODO: implement } public void SaveProject() { - ProjectService.Save(Project); + // TODO: implement } public void CreateNewProject() @@ -410,26 +317,6 @@ { Project = projectBeingCreated; } - - if (IsProjectCreatedInTemporaryDirectory) - { - TemporaryProjectBeingSaved = true; - - // for now enable async save only during start-up - if (initializing && TemporaryProjectSavedAsynchroneously) - { - var saveProjectThread = new Thread(SaveTemporaryProjectThread) - { - CurrentCulture = CultureInfo.CurrentCulture, - CurrentUICulture = CultureInfo.CurrentUICulture - }; - saveProjectThread.Start(); - } - else - { - SaveTemporaryProjectThread(); - } - } } public bool OpenProject(string path) @@ -439,24 +326,16 @@ throw new InvalidOperationException(Properties.Resources.DeltaShellApplication_CreateNewProject_Run___must_be_called_first_before_project_can_be_opened); } - if (Project != null) - { - CloseProject(); - } - - var retrievedProject = ProjectService.Open(path); - if (retrievedProject != null) - { - Project = retrievedProject; - } - return retrievedProject != null; + // TODO: implement and remove Project = new Project(); + Project = new Project(); + return false; } public void Exit() { Trace.Listeners.Clear(); - if (Project != null && Project.IsChanged) + if (Project != null) { CloseProject(); } @@ -585,40 +464,6 @@ return AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(asm => asm.FullName == args.Name); } - [InvokeRequired] - private void ProjectServiceProjectSaving(object sender, EventArgs e) - { - if (ProjectSaving != null) - { - ProjectSaving(Project); - } - } - - [InvokeRequired] - private void ProjectServiceProjectSaveFailed(object sender, EventArgs e) - { - if (ProjectSaveFailed != null) - { - ProjectSaveFailed(Project); - } - } - - [InvokeRequired] - private void ProjectServiceProjectSaved(object sender, EventArgs e) - { - if (ProjectSaved != null) - { - ProjectSaved(Project); - } - } - - private void SaveTemporaryProjectThread() - { - ProjectService.SaveProjectInTemporaryFolder(projectBeingCreated); - TemporaryProjectSaved = true; - TemporaryProjectBeingSaved = false; - } - private static void LogSystemInfo() { log.DebugFormat(Properties.Resources.DeltaShellApplication_LogSystemInfo_Environmental_variables_); @@ -704,28 +549,6 @@ } } - // TODO: migrate into ProjectService - private void InitializeProjectRepositoryFactory() - { - //File.WriteAllText(@"d:\check.graphml", new PluginPersistencyGraphMlExporter().GetGraphML(Plugins)); - RegisterPersistentAssemblies(ProjectRepositoryFactory); - - // add data access listeners from plugins - foreach (var plugin in Plugins) - { - var dataAccessListenersProvider = plugin as IDataAccessListenersProvider; - if (dataAccessListenersProvider != null) - { - foreach (var listener in dataAccessListenersProvider.CreateDataAccessListeners()) - { - ProjectRepositoryFactory.AddDataAccessListener(listener); - } - } - } - - projectService.ProjectRepositoryFactory = ProjectRepositoryFactory; - } - private void RegisterDataTypes() { log.Debug(Properties.Resources.DeltaShellApplication_RegisterDataTypes_Registering_persistent_data_types____); @@ -745,7 +568,8 @@ var projectImporter = fileImporter as IProjectImporter; if (projectImporter != null) { - projectImporter.ProjectService = ProjectService; + // TODO: implement + // projectImporter.ProjectService = ProjectService; } fileImporters.Add(fileImporter); @@ -763,7 +587,8 @@ var projectExporter = fileExporter as IProjectItemExporter; if (projectExporter != null) { - projectExporter.ProjectService = ProjectService; + // TODO: implement + // projectExporter.ProjectService = ProjectService; } fileExporters.Add(fileExporter); @@ -772,16 +597,6 @@ } } - private static void RegisterPersistentAssemblies(IProjectRepositoryFactory projectRepositoryFactory) - { - log.Debug(Properties.Resources.DeltaShellApplication_RegisterPersistentAssemblies_Registering_assemblies_containing_persistent_data_types____); - - foreach (var plugin in PluginManager.GetPlugins()) - { - projectRepositoryFactory.AddPlugin(plugin); - } - } - private void Dispose(bool disposing) { if (!disposed) @@ -792,13 +607,6 @@ projectBeingCreated = null; - //make sure we close our repository avoiding memory leaks - if (projectService != null) - { - projectService.Dispose(); - projectService = null; - } - foreach (var plugin in Plugins) { plugin.Deactivate(); Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/DeltaShell/DeltaShell.Core/InMemoryProjectRepository.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/DeltaShell/DeltaShell.Core/ProjectRepositoryFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/DeltaShell/DeltaShell.Core/Services/ProjectService.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs =================================================================== diff -u -r22ecee6c202a4fc87caa5b5fa30f472ad721e198 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision 22ecee6c202a4fc87caa5b5fa30f472ad721e198) +++ src/DeltaShell/DeltaShell.Gui/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -269,11 +269,6 @@ { log.Info(Resources.DeltaShellGui_Run_Starting_application____); - if (!GetType().Assembly.Location.ToLower().Contains("test")) // HACK: make sure it is sync in tests - { - DeltaShellApplication.TemporaryProjectSavedAsynchroneously = true; - } - application.Run(); } @@ -283,7 +278,7 @@ log.Info(Resources.DeltaShellGui_Run_Waiting_until_new_project_is_initialized____); - while (!DeltaShellApplication.TemporaryProjectSaved || Application.Plugins.Any(p => !p.IsActive)) + while (Application.Plugins.Any(p => !p.IsActive)) { Thread.Sleep(50); splashScreen.Dispatcher.Invoke(DispatcherPriority.Render, new Action(() => { })); @@ -293,8 +288,6 @@ runFinished = true; - DeltaShellApplication.TemporaryProjectSavedAsynchroneously = false; - if (AfterRun != null) { AfterRun(); @@ -627,8 +620,6 @@ private void ApplicationProjectOpened(Project project) { - Application.Project.IsChanged = false; - ResumeUI(); } Index: src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -61,7 +61,7 @@ @@ -131,20 +131,23 @@ + Name="ButtonQuickAccessNewProject" + Icon="/DeltaShell.Gui;component\Resources\DocumentHS.png" + Click="OnFileNewClicked"/> + Name="ButtonQuickAccessOpenProject" + Icon="/DeltaShell.Gui;component\Resources\openfolderHS.png" + Click="OnFileOpenClicked" /> + Name="ButtonQuickAccessSaveProject" + Icon="/DeltaShell.Gui;component\Resources\saveHS.png" + Click="OnFileSaveClicked" /> Index: src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -rc4fb042f3ea7c21852fba8fdc21bdeac96da6419 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision c4fb042f3ea7c21852fba8fdc21bdeac96da6419) +++ src/DeltaShell/DeltaShell.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -25,7 +25,6 @@ using DelftTools.Utils.Collections; using DelftTools.Utils.Collections.Extensions; using DelftTools.Utils.Interop; -using DelftTools.Utils.Reflection; using DeltaShell.Core; using DeltaShell.Gui.Forms.OptionsDialog; using DeltaShell.Gui.Properties; @@ -663,11 +662,20 @@ var isActivityRunning = Gui.Application.IsActivityRunning(); // filemenu items dependent on existence of project and if processes are running + /* ButtonMenuFileNewProject.IsEnabled = !isActivityRunning; ButtonMenuFileOpenProject.IsEnabled = !isActivityRunning; ButtonMenuFileSaveProject.IsEnabled = appHasProject && !isActivityRunning; ButtonMenuFileSaveProjectAs.IsEnabled = appHasProject && !isActivityRunning; ButtonMenuFileCloseProject.IsEnabled = appHasProject && !isActivityRunning; + * */ + + // TODO: remove when implemented + ButtonMenuFileNewProject.IsEnabled = false; + ButtonMenuFileOpenProject.IsEnabled = false; + ButtonMenuFileSaveProject.IsEnabled = false; + ButtonMenuFileSaveProjectAs.IsEnabled = false; + ButtonMenuFileCloseProject.IsEnabled = false; } private void InitMessagesWindowOrActivate() @@ -711,7 +719,7 @@ private void OnFileSaveClicked(object sender, RoutedEventArgs e) { - MessageBox.Show("Not implemented yet."); + //TODO: Implement return; // Original code: @@ -721,7 +729,7 @@ private void OnFileSaveAsClicked(object sender, RoutedEventArgs e) { - MessageBox.Show("Not implemented yet."); + //TODO: Implement return; // Original code: @@ -731,17 +739,23 @@ private void OnAfterProjectSaveOrOpen(bool actionSuccesful) { + //TODO: Implement + return; + + // Original code: + /* if (actionSuccesful) { AddNewMruItem(Gui.Application.ProjectFilePath); CommitMruToSettings(); } ValidateItems(); + */ } private void OnFileOpenClicked(object sender, RoutedEventArgs e) { - MessageBox.Show("Not implemented yet."); + //TODO: Implement return; // Original code: @@ -751,14 +765,22 @@ private void OnFileCloseClicked(object sender, RoutedEventArgs e) { - Gui.CommandHandler.TryCloseWTIProject(); - ValidateItems(); + //TODO: Implement + return; + + // Original code: + //Gui.CommandHandler.TryCloseWTIProject(); + //ValidateItems(); } private void OnFileNewClicked(object sender, RoutedEventArgs e) { - Gui.CommandHandler.TryCreateNewWTIProject(); - ValidateItems(); + //TODO: Implement + return; + + // Original code: + //Gui.CommandHandler.TryCreateNewWTIProject(); + //ValidateItems(); } private void OnFileExitClicked(object sender, RoutedEventArgs e) @@ -940,11 +962,15 @@ SetColorTheme((string) Gui.Application.UserSettings["colorTheme"]); FileManualButton.IsEnabled = File.Exists(ConfigurationManager.AppSettings["manualFileName"]); - // Enable as soon as relevant/implemented + // TODO: Enable as soon as relevant/implemented AboutButton.IsEnabled = false; LicenseButton.IsEnabled = false; FeedbackButton.IsEnabled = false; + ButtonQuickAccessNewProject.IsEnabled = false; + ButtonQuickAccessOpenProject.IsEnabled = false; + ButtonQuickAccessSaveProject.IsEnabled = false; + UpdateMainWindowRibbonElements(); UpdateRibbonExtensions(); @@ -1220,9 +1246,6 @@ private HelpAboutBoxData GetAboutBoxData() { - //dat ain the aboutbox. Some is defined in the assembly, some in the settingshelper. - var executingAssemblyInfo = AssemblyUtils.GetExecutingAssemblyInfo(); - var data = new HelpAboutBoxData { //product and version from settingshelper Index: src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs =================================================================== diff -u -rfe0228504fc61d6af56be4c0f6a8fc28690f9064 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision fe0228504fc61d6af56be4c0f6a8fc28690f9064) +++ src/DeltaShell/DeltaShell.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -102,29 +102,6 @@ { Log.Info("Closing current WTI project."); - // Ask to save any changes first - if (gui.Application.Project.IsChanged) - { - var result = - MessageBox.Show(string.Format(Resources.GuiCommandHandler_CloseProject_Save_changes_to_the_project___0_, gui.Application.Project.Name), - Resources.GuiCommandHandler_CloseProject_Closing_project____, MessageBoxButtons.YesNoCancel); - - if (result == DialogResult.Yes) - { - // Code below disabled as save/load plugin not implemented yet. Keep existing framework though. - var alwaysOkResult = MessageBox.Show("Not implemented yet."); - if (alwaysOkResult != DialogResult.OK) - { - if (!SaveProject()) {} - } - } - - if (result == DialogResult.Cancel) - { - return false; - } - } - // Disconnect project ((INotifyPropertyChanged) gui.Application.Project).PropertyChanged -= CurrentProjectChanged; @@ -158,84 +135,6 @@ return projectItemActiveView; } - public bool SaveProject() - { - var project = gui.Application.Project; - if (project == null) - { - return false; - } - - if (project.IsTemporary) - { - return SaveProjectAs(); - } - - string path = null; - - UnselectActiveControlToForceBinding(); - - SaveProjectWithProgressDialog(path); - - AddProjectToMruList(); - - RefreshGui(); - - return true; - } - - /// - /// Shows a dialog for saving the project to file. - /// - /// - public bool SaveProjectAs() - { - var project = gui.Application.Project; - if (project == null) - { - return false; - } - - UnselectActiveControlToForceBinding(); - - // show file open dialog and select project file - var saveFileDialog = new SaveFileDialog - { - Filter = string.Format(Resources.Wti_project_file_filter), - FilterIndex = 1, - RestoreDirectory = true, - FileName = String.Format("{0}.wti", project.Name) - }; - - if (saveFileDialog.ShowDialog() == DialogResult.OK) - { - try - { - string path = saveFileDialog.FileName; // Constructs file path, might throw PathTooLongException - - project.Name = Path.GetFileNameWithoutExtension(path); - SaveProjectWithProgressDialog(path); - - Log.InfoFormat(Resources.GuiCommandHandler_SaveProjectAs_Project__0__saved, path); - } - catch (PathTooLongException) - { - MessageBox.Show(Resources.GuiCommandHandler_SaveProjectAs_The_specified_file_path_is_too_long__please_choose_a_shorter_path_, Resources.GuiCommandHandler_SaveProjectAs_Warning, MessageBoxButtons.OK, MessageBoxIcon.Warning); - return false; - } - } - else - { - return false; - } - - AddProjectToMruList(); - - RefreshGui(); - - return true; - } - public void ShowProperties() { ((MainWindow) gui.MainWindow).InitPropertiesWindowAndActivate(); @@ -422,24 +321,6 @@ gui.Application.ProjectClosing -= ApplicationProjectClosing; } - private void SaveProjectWithProgressDialog(string path = null) - { - var actualPath = path ?? gui.Application.ProjectFilePath; - - ProgressBarDialog.PerformTask(string.Format(Resources.GuiCommandHandler_SaveProjectWithProgressDialog_Saving__0_, actualPath), - () => - { - if (path == null) - { - gui.Application.SaveProject(); - } - else - { - gui.Application.SaveProjectAs(path); - } - }); - } - private GuiImportHandler CreateGuiImportHandler() { return new GuiImportHandler(gui); @@ -492,7 +373,7 @@ //throw new NotImplementedException(); } } - + private void AddProjectToMruList() { var mruList = (StringCollection) Settings.Default["mruList"]; @@ -503,7 +384,7 @@ mruList.Insert(0, gui.Application.ProjectFilePath); } - + private static void UnselectActiveControlToForceBinding() { var elementWithFocus = Keyboard.FocusedElement; @@ -621,7 +502,7 @@ gui.MainWindow.Title = string.Format(Resources.GuiCommandHandler_UpdateGui__no_project_opened_____0_, mainWindowTitle); return; } - gui.MainWindow.Title = project.Name + (project.IsChanged ? "*" : "") + " - " + mainWindowTitle; + gui.MainWindow.Title = project.Name + " - " + mainWindowTitle; ((INotifyPropertyChanged) project).PropertyChanged -= CurrentProjectChanged; ((INotifyPropertyChanged) project).PropertyChanged += CurrentProjectChanged; Index: src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs =================================================================== diff -u -rdc376cc4c4a8ae69fc722a23ca01246e8a9cb39b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision dc376cc4c4a8ae69fc722a23ca01246e8a9cb39b) +++ src/DeltaShell/DeltaShell.Gui/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.IO; using System.Linq; using System.Windows.Forms; using DelftTools.Controls; @@ -147,7 +148,7 @@ { get { - return gui.Application.ProjectDataDirectory; + return Path.GetDirectoryName(gui.Application.ProjectFilePath); } } Index: src/DeltaShell/DeltaShell.Plugins.CommonTools/CommonToolsApplicationPlugin.cs =================================================================== diff -u -rcdfaabb651eef71a8334ea62138fa420fe135356 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Plugins.CommonTools/CommonToolsApplicationPlugin.cs (.../CommonToolsApplicationPlugin.cs) (revision cdfaabb651eef71a8334ea62138fa420fe135356) +++ src/DeltaShell/DeltaShell.Plugins.CommonTools/CommonToolsApplicationPlugin.cs (.../CommonToolsApplicationPlugin.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -1,15 +1,13 @@ -using System.Collections.Generic; using System.Drawing; using System.Reflection; using DelftTools.Shell.Core; -using DelftTools.Shell.Core.Dao; namespace DeltaShell.Plugins.CommonTools { /// /// Common tool plugins /// - public class CommonToolsApplicationPlugin : ApplicationPlugin, IDataAccessListenersProvider + public class CommonToolsApplicationPlugin : ApplicationPlugin { /// /// Gets the name of the plugin @@ -70,12 +68,5 @@ return new Bitmap(32, 32); } } - - - - public IEnumerable CreateDataAccessListeners() - { - yield return new CommonToolsDataAccessListener(); - } } } \ No newline at end of file Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `src/DeltaShell/DeltaShell.Plugins.CommonTools/CommonToolsDataAccessListener.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: src/DeltaShell/DeltaShell.Plugins.CommonTools/DeltaShell.Plugins.CommonTools.csproj =================================================================== diff -u -rcdfaabb651eef71a8334ea62138fa420fe135356 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- src/DeltaShell/DeltaShell.Plugins.CommonTools/DeltaShell.Plugins.CommonTools.csproj (.../DeltaShell.Plugins.CommonTools.csproj) (revision cdfaabb651eef71a8334ea62138fa420fe135356) +++ src/DeltaShell/DeltaShell.Plugins.CommonTools/DeltaShell.Plugins.CommonTools.csproj (.../DeltaShell.Plugins.CommonTools.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -73,7 +73,6 @@ Properties\GlobalAssembly.cs - Index: test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs (.../ProjectTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs (.../ProjectTest.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -22,8 +22,6 @@ Assert.AreEqual("Project", project.Name); Assert.IsNull(project.Description); CollectionAssert.IsEmpty(project.Items); - Assert.IsFalse(project.IsChanged); - Assert.IsFalse(project.IsTemporary); } [Test] @@ -39,8 +37,6 @@ Assert.AreEqual(someName, project.Name); Assert.IsNull(project.Description); CollectionAssert.IsEmpty(project.Items); - Assert.IsFalse(project.IsChanged); - Assert.IsFalse(project.IsTemporary); } [Test] @@ -54,15 +50,11 @@ { Name = niceProjectName, Description = nicerDescription, - IsChanged = true, - IsTemporary = true }; // assert Assert.AreEqual(niceProjectName, project.Name); Assert.AreEqual(nicerDescription, project.Description); - Assert.IsTrue(project.IsChanged); - Assert.IsTrue(project.IsTemporary); } [Test] Index: test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell.IntegrationTests.csproj =================================================================== diff -u -r2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell.IntegrationTests.csproj (.../DeltaShell.IntegrationTests.csproj) (revision 2ff69dfc67c77d80c1ed2f4f1f9bc0172e28e518) +++ test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell.IntegrationTests.csproj (.../DeltaShell.IntegrationTests.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -77,7 +77,6 @@ - Index: test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs =================================================================== diff -u -r716173ea7d18bb5436050eed3def1c53ac8f8aac -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs (.../DeltaShellGuiIntegrationTest.cs) (revision 716173ea7d18bb5436050eed3def1c53ac8f8aac) +++ test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/DeltaShellGuiIntegrationTest.cs (.../DeltaShellGuiIntegrationTest.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -3,12 +3,10 @@ using System.Threading; using System.Windows; using DelftTools.Shell.Core; -using DelftTools.Shell.Core.Dao; using DelftTools.Shell.Core.Workflow; using DelftTools.TestUtils; using DelftTools.Utils.Collections; using DeltaShell.Core; -using DeltaShell.Core.Services; using DeltaShell.Gui; using DeltaShell.Plugins.CommonTools; using DeltaShell.Plugins.CommonTools.Gui; @@ -147,28 +145,6 @@ } [Test] - public void ProjectIsTemporaryAtTheBeginningAndAfterCreateNew() - { - using (var gui = new DeltaShellGui()) - { - var app = gui.Application; - - app.Plugins.Add(new CommonToolsApplicationPlugin()); - app.Plugins.Add(new SharpMapGisApplicationPlugin()); - gui.Plugins.Add(new ProjectExplorerGuiPlugin()); - gui.Run(); - - app.UserSettings["autosaveWindowLayout"] = false; // skip damagin of window layout - - app.Project.IsTemporary.Should("Project is temporary at the beginning").Be.True(); - - gui.CommandHandler.TryCreateNewWTIProject(); - - app.Project.IsTemporary.Should("Project is temporary after create new").Be.True(); - } - } - - [Test] public void ClosingEmptyProjectShouldNotGiveException() { using (var gui = new DeltaShellGui()) @@ -228,44 +204,6 @@ } [Test] - public void CloseProjectDisposesAllResources() - { - var repository = mocks.StrictMock(); - var factory = mocks.Stub(); - Expect.Call(factory.CreateNew()).Return(repository).Repeat.Once(); - - var project = new Project("project"); - var map = new Map(); - var vectorLayer = new VectorLayer(); - - project.Items.Add(map); - - var shapeFile = mocks.StrictMock(); - shapeFile.Expect(sf => sf.GetExtents()).Return(null).Repeat.Any(); - shapeFile.Expect(sf => sf.FeaturesChanged += null).IgnoreArguments().Repeat.Once(); - shapeFile.Expect(sf => sf.FeaturesChanged -= null).IgnoreArguments().Repeat.Twice(); - shapeFile.Expect(sf => sf.AddNewFeatureFromGeometryDelegate = null).IgnoreArguments().Repeat.Once(); - shapeFile.Expect(sf => sf.CoordinateSystemChanged += null).IgnoreArguments().Repeat.Once(); - shapeFile.Expect(sf => sf.CoordinateSystemChanged -= null).IgnoreArguments().Repeat.Twice(); - shapeFile.Expect(sf => sf.Dispose()).Repeat.Once(); - shapeFile.Expect(sf => sf.AddNewFeatureFromGeometryDelegate).Return(null).Repeat.Once(); - - Expect.Call(repository.Path).Repeat.Any().Return("a_path"); - Expect.Call(repository.IsOpen).Return(true); - Expect.Call(repository.Close); - - mocks.ReplayAll(); - - vectorLayer.DataSource = shapeFile; - map.Layers.Add(vectorLayer); - var projectService = new ProjectService(factory); - - projectService.Close(project); - - mocks.VerifyAll(); - } - - [Test] public void StartGuiWithToolboxDoesNotCrash() { using (var gui = new DeltaShellGui()) @@ -288,8 +226,6 @@ [Test] public void CreateNewProjectAfterStartWithCommonPluginsShouldBeFast() { - DeltaShellApplication.TemporaryProjectSavedAsynchroneously = true; - using (var gui = new DeltaShellGui()) { var app = gui.Application; @@ -430,8 +366,6 @@ private static void StartWithCommonPlugins() { - DeltaShellApplication.TemporaryProjectSavedAsynchroneously = true; - using (var gui = new DeltaShellGui()) { var app = gui.Application; Index: test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/GuiImportHandlerTest.cs =================================================================== diff -u -reac97eab4acc4d2698cdc33a310e4fe843d54607 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision eac97eab4acc4d2698cdc33a310e4fe843d54607) +++ test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Gui/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -108,7 +108,6 @@ targetItemImporter.Expect(fi => fi.CanImportOn(null)).IgnoreArguments().Return(true).Repeat.Any(); application.Expect(a => a.FileImporters).IgnoreArguments().Repeat.Any().Return(importers); - application.Expect(a => a.ProjectDataDirectory).Return("").IgnoreArguments().Repeat.Any(); mocks.ReplayAll(); @@ -160,7 +159,6 @@ targetItemImporter2.Expect(fi => fi.CanImportOnRootLevel).Return(true); application.Expect(a => a.FileImporters).IgnoreArguments().Repeat.Any().Return(importers); - application.Expect(a => a.ProjectDataDirectory).Return("").IgnoreArguments().Repeat.Any(); mocks.ReplayAll(); @@ -210,7 +208,6 @@ targetItemImporterWhereCanImportIsFalse.Expect(fi => fi.CanImportOn(null)).IgnoreArguments().Return(false).Repeat.Any(); application.Expect(a => a.FileImporters).IgnoreArguments().Repeat.Any().Return(importers); - application.Expect(a => a.ProjectDataDirectory).Return("").IgnoreArguments().Repeat.Any(); mocks.ReplayAll(); @@ -251,7 +248,6 @@ targetItemImporter.Expect(fi => fi.CanImportOn(null)).IgnoreArguments().Return(true).Repeat.Any(); application.Expect(a => a.FileImporters).IgnoreArguments().Repeat.Any().Return(importers); - application.Expect(a => a.ProjectDataDirectory).Return("").IgnoreArguments().Repeat.Any(); mocks.ReplayAll(); @@ -309,7 +305,6 @@ fileImporter3.Expect(fi => fi.CanImportOn(null)).IgnoreArguments().Return(true).Repeat.Any(); application.Expect(a => a.FileImporters).Repeat.Any().Return(importers).Repeat.Once(); - application.Expect(a => a.ProjectDataDirectory).Return("").IgnoreArguments().Repeat.Any(); mocks.ReplayAll(); Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.IntegrationTests/DeltaShell/DeltaShell.Plugins.SharpMapGis/SharpMapGisPluginTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: test/DeltaShell/DeltaShell.Plugins.ProjectExplorer.Tests/ProjectTreeViewTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.Plugins.ProjectExplorer.Tests/ProjectTreeViewTest.cs (.../ProjectTreeViewTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Plugins.ProjectExplorer.Tests/ProjectTreeViewTest.cs (.../ProjectTreeViewTest.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -1,7 +1,6 @@ using System.Configuration; using System.Linq; using DelftTools.Shell.Core; -using DelftTools.Shell.Core.Services; using DelftTools.Shell.Gui; using DeltaShell.Gui; using NUnit.Framework; @@ -37,14 +36,9 @@ Gui = gui }; - var projectService = mocks.StrictMock(); - // in case of mock Expect.Call(app.UserSettings).Return(settings).Repeat.Any(); - // we set an expectation that the ProjectSaved event will be attached to, see also - // http://haacked.com/archive/2006/06/23/UsingRhinoMocksToUnitTestEventsOnInterfaces.aspx - projectService.ProjectSaved += null; LastCall.Repeat.Any(); LastCall.IgnoreArguments(); Index: test/DeltaShell/DeltaShell.Tests/Core/DelftShellApplicationTest.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.Tests/Core/DelftShellApplicationTest.cs (.../DelftShellApplicationTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ test/DeltaShell/DeltaShell.Tests/Core/DelftShellApplicationTest.cs (.../DelftShellApplicationTest.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -80,23 +80,6 @@ } [Test] - public void DisposingApplicationClosesProjectOnProjectService() - { - using (var delftShellApplication = new DeltaShellApplication()) - { - var service = new TestProjectService(); - delftShellApplication.ProjectService = service; - delftShellApplication.Project = new Project(); - - //action! - delftShellApplication.Dispose(); - - //assert dispose got called - Assert.AreEqual(1, service.CloseCallCount); - } - } - - [Test] public void CurrentCultureIsChangedWhenTurkishOrAzeri() { Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/Core/Services/ProjectServiceTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj =================================================================== diff -u -ra9ee3a5708adb2ab6d84460265bed2fd7dd59767 -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj (.../DeltaShell.Tests.csproj) (revision a9ee3a5708adb2ab6d84460265bed2fd7dd59767) +++ test/DeltaShell/DeltaShell.Tests/DeltaShell.Tests.csproj (.../DeltaShell.Tests.csproj) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -118,9 +118,7 @@ TestView.cs - - True True Index: test/DeltaShell/DeltaShell.Tests/TestObjects/TestApplication.cs =================================================================== diff -u -rfbe5d1ac043ae74461b82b0ab71c5388bfbbc58b -rda53d965c969b482adbcccea7962ccd477d51fe6 --- test/DeltaShell/DeltaShell.Tests/TestObjects/TestApplication.cs (.../TestApplication.cs) (revision fbe5d1ac043ae74461b82b0ab71c5388bfbbc58b) +++ test/DeltaShell/DeltaShell.Tests/TestObjects/TestApplication.cs (.../TestApplication.cs) (revision da53d965c969b482adbcccea7962ccd477d51fe6) @@ -4,8 +4,6 @@ using System.Configuration; using System.Resources; using DelftTools.Shell.Core; -using DelftTools.Shell.Core.Dao; -using DelftTools.Shell.Core.Services; using DelftTools.Shell.Core.Workflow; namespace DeltaShell.Tests.TestObjects @@ -31,15 +29,6 @@ public Project Project { get; set; } - public IProjectRepositoryFactory ProjectRepositoryFactory - { - get - { - throw new NotImplementedException(); - } - set {} - } - public IActivityRunner ActivityRunner { get @@ -53,8 +42,6 @@ public ResourceManager Resources { get; set; } - public IProjectService ProjectService { get; set; } - public IEnumerable FileImporters { get @@ -87,16 +74,7 @@ } } - public string Version - { - get - { - return ""; - } - } - public string PluginVersions { get; private set; } - public bool IsDataAccessSynchronizationDisabled { get; set; } public ApplicationPlugin GetPluginForType(Type type) { Fisheye: Tag da53d965c969b482adbcccea7962ccd477d51fe6 refers to a dead (removed) revision in file `test/DeltaShell/DeltaShell.Tests/TestObjects/TestProjectService.cs'. Fisheye: No comparison available. Pass `N' to diff?