Author: lcorneliussen Date: Thu Nov 10 11:18:33 2011 New Revision: 1200271 URL: http://svn.apache.org/viewvc?rev=1200271&view=rev Log: [NPANDAY-479] Build-fix: Refactoring VS Add-in
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Commands/ButtonCommandRegistry.cs incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Helper/VisualStudioControlsFinder.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Commands/ButtonCommandRegistry.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Commands/ButtonCommandRegistry.cs?rev=1200271&r1=1200270&r2=1200271&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Commands/ButtonCommandRegistry.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Commands/ButtonCommandRegistry.cs Thu Nov 10 11:18:33 2011 @@ -86,9 +86,10 @@ namespace NPanday.VisualStudio.Addin.Com public void UnregisterAll() { - foreach (var commandBarControl in _keepReferences.ToArray()) + foreach (CommandBarControl commandBarControl in _keepReferences.ToArray()) { - _logger.Log(Level.DEBUG, "Removing control " + commandBarControl.Caption + " on " + commandBarControl.HelpContextId + " at index " + commandBarControl.Index); + // TODO: find (or previouvsly cache the commandbar) + _logger.Log(Level.DEBUG, "TODO!! Remove " + commandBarControl.Caption + " on ?? at index " + commandBarControl.Index); } } } Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Helper/VisualStudioControlsFinder.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Helper/VisualStudioControlsFinder.cs?rev=1200271&r1=1200270&r2=1200271&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Helper/VisualStudioControlsFinder.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Helper/VisualStudioControlsFinder.cs Thu Nov 10 11:18:33 2011 @@ -117,14 +117,14 @@ namespace NPanday.VisualStudio.Addin.Hel ensureIsIndexed(); CommandBarControl control; - var commandNamePath = buildCommandCaptionPath(commandBar, controlCaptionOrCommandName); + string commandNamePath = buildCommandCaptionPath(commandBar, controlCaptionOrCommandName); if (_controlByBarAndCommandNamePath.TryGetValue(commandNamePath, out control)) { return control; } - var commandCaptionPath = buildCommandCaptionPath(commandBar, controlCaptionOrCommandName); + string commandCaptionPath = buildCommandCaptionPath(commandBar, controlCaptionOrCommandName); if (_controlByCaptionPath.TryGetValue(commandCaptionPath, out control)) { string commandName = getButtonTargetCommand(control).Name;