Skip to content

Commit 02e01fe

Browse files
dnauckRubenWillems
dnauck
authored and
RubenWillems
committed
Merge branch 'master', remote-tracking branch 'upstream/master'
1 parent 1399450 commit 02e01fe

10 files changed

Lines changed: 357 additions & 786 deletions

File tree

‎project/CCTrayLib/Presentation/MainForm.cs‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,16 @@ private void InitializeComponent()
220220
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
221221
this.mnuAbout = new System.Windows.Forms.MenuItem();
222222
this.lvProjects = new System.Windows.Forms.ListView();
223-
this.colProject = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
224-
this.colServer = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
225-
this.colCategory = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
226-
this.colActivity = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
227-
this.colDetail = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
228-
this.colLastBuildLabel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
229-
this.colLastBuildTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
230-
this.colProjectStatus = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
231-
this.colQName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
232-
this.colQPriority = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
223+
this.colProject = new System.Windows.Forms.ColumnHeader();
224+
this.colServer = new System.Windows.Forms.ColumnHeader();
225+
this.colCategory = new System.Windows.Forms.ColumnHeader();
226+
this.colActivity = new System.Windows.Forms.ColumnHeader();
227+
this.colDetail = new System.Windows.Forms.ColumnHeader();
228+
this.colLastBuildLabel = new System.Windows.Forms.ColumnHeader();
229+
this.colLastBuildTime = new System.Windows.Forms.ColumnHeader();
230+
this.colProjectStatus = new System.Windows.Forms.ColumnHeader();
231+
this.colQName = new System.Windows.Forms.ColumnHeader();
232+
this.colQPriority = new System.Windows.Forms.ColumnHeader();
233233
this.projectContextMenu = new System.Windows.Forms.ContextMenu();
234234
this.mnuForce = new System.Windows.Forms.MenuItem();
235235
this.mnuAbort = new System.Windows.Forms.MenuItem();
@@ -263,7 +263,6 @@ private void InitializeComponent()
263263
this.btnStartStopProject = new System.Windows.Forms.Button();
264264
this.splitterQueueView = new System.Windows.Forms.Splitter();
265265
this.pnlViewQueues = new System.Windows.Forms.Panel();
266-
this.queueTreeView = new ThoughtWorks.CruiseControl.CCTrayLib.Presentation.QueueTreeView();
267266
this.queueIconList = new System.Windows.Forms.ImageList(this.components);
268267
this.queueContextMenu = new System.Windows.Forms.ContextMenu();
269268
this.mnuQueueCancelPending = new System.Windows.Forms.MenuItem();
@@ -274,6 +273,7 @@ private void InitializeComponent()
274273
this.updateProjectsButton = new System.Windows.Forms.Button();
275274
this.updateProjectsMessage = new System.Windows.Forms.Label();
276275
this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components);
276+
this.queueTreeView = new ThoughtWorks.CruiseControl.CCTrayLib.Presentation.QueueTreeView();
277277
menuItem1 = new System.Windows.Forms.MenuItem();
278278
this.pnlButtons.SuspendLayout();
279279
this.pnlViewQueues.SuspendLayout();
@@ -319,9 +319,9 @@ private void InitializeComponent()
319319
this.lvProjects.TabIndex = 0;
320320
this.lvProjects.UseCompatibleStateImageBehavior = false;
321321
this.lvProjects.View = System.Windows.Forms.View.Details;
322-
this.lvProjects.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.lvProjects_ColumnClick);
323322
this.lvProjects.SelectedIndexChanged += new System.EventHandler(this.lvProjects_SelectedIndexChanged);
324323
this.lvProjects.DoubleClick += new System.EventHandler(this.lvProjects_DoubleClick);
324+
this.lvProjects.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.lvProjects_ColumnClick);
325325
//
326326
// colProject
327327
//
@@ -371,6 +371,7 @@ private void InitializeComponent()
371371
//
372372
this.colQPriority.Text = "Q Priority";
373373
this.colQPriority.Width = 100;
374+
374375
//
375376
// projectContextMenu
376377
//
@@ -615,18 +616,6 @@ private void InitializeComponent()
615616
this.pnlViewQueues.TabIndex = 4;
616617
this.pnlViewQueues.Visible = false;
617618
//
618-
// queueTreeView
619-
//
620-
this.queueTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
621-
this.queueTreeView.ImageIndex = 0;
622-
this.queueTreeView.ImageList = this.queueIconList;
623-
this.queueTreeView.Location = new System.Drawing.Point(0, 0);
624-
this.queueTreeView.Name = "queueTreeView";
625-
this.queueTreeView.SelectedImageIndex = 0;
626-
this.queueTreeView.Size = new System.Drawing.Size(200, 188);
627-
this.queueTreeView.TabIndex = 2;
628-
this.queueTreeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.queueTreeView_MouseUp);
629-
//
630619
// queueIconList
631620
//
632621
this.queueIconList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
@@ -693,8 +682,8 @@ private void InitializeComponent()
693682
//
694683
// updateProjectsMessage
695684
//
696-
this.updateProjectsMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
697-
| System.Windows.Forms.AnchorStyles.Right)));
685+
this.updateProjectsMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
686+
| System.Windows.Forms.AnchorStyles.Right)));
698687
this.updateProjectsMessage.AutoEllipsis = true;
699688
this.updateProjectsMessage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
700689
this.updateProjectsMessage.Location = new System.Drawing.Point(42, 3);
@@ -711,6 +700,18 @@ private void InitializeComponent()
711700
this.trayIcon.Click += new System.EventHandler(this.trayIcon_Click);
712701
this.trayIcon.DoubleClick += new System.EventHandler(this.trayIcon_DoubleClick);
713702
//
703+
// queueTreeView
704+
//
705+
this.queueTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
706+
this.queueTreeView.ImageIndex = 0;
707+
this.queueTreeView.ImageList = this.queueIconList;
708+
this.queueTreeView.Location = new System.Drawing.Point(0, 0);
709+
this.queueTreeView.Name = "queueTreeView";
710+
this.queueTreeView.SelectedImageIndex = 0;
711+
this.queueTreeView.Size = new System.Drawing.Size(200, 188);
712+
this.queueTreeView.TabIndex = 2;
713+
this.queueTreeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.queueTreeView_MouseUp);
714+
//
714715
// MainForm
715716
//
716717
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
@@ -850,10 +851,6 @@ private void UpdateForceAbortBuildButtonLabel()
850851
{
851852
btnForceBuild.Text = controller.IsProjectBuilding ? "Abort &Build" : "Force &Build";
852853
btnForceBuild.Enabled = ((controller.SelectedProject != null) && controller.SelectedProject.Detail.ShowForceBuildButton);
853-
mnuAbort.Enabled = ((controller.SelectedProject != null) && controller.SelectedProject.Detail.ShowForceBuildButton);
854-
mnuForce.Enabled = ((controller.SelectedProject != null) && controller.SelectedProject.Detail.ShowForceBuildButton);
855-
mnuStart.Enabled = ((controller.SelectedProject != null) && controller.SelectedProject.Detail.ShowStartStopButton);
856-
mnuStop.Enabled = ((controller.SelectedProject != null) && controller.SelectedProject.Detail.ShowStartStopButton);
857854
}
858855

859856
private void mnuWebPage_Click(object sender, EventArgs e)
@@ -898,7 +895,7 @@ private void projectContextMenu_Popup(object sender, EventArgs e)
898895
mnuFixBuild.Visible = controller.CanFixBuild();
899896
mnuCopyBuildLabel.Visible = controller.IsProjectSelected;
900897
currentStatusMenu.Visible = controller.IsProjectSelected;
901-
packagesMenu.Visible = controller.IsProjectSelected;
898+
packagesMenu.Visible = controller.IsProjectSelected;
902899
}
903900

904901
private void mnuFilePreferences_Click(object sender, EventArgs e)
@@ -1270,6 +1267,5 @@ private void updateProjectsButton_Click(object sender, EventArgs e)
12701267
{
12711268
controller.UpdateProjectList();
12721269
}
1273-
12741270
}
12751271
}

‎project/CCTrayLib/Presentation/MainForm.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<value>476, 17</value>
149149
</metadata>
150150
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151-
<value>145</value>
151+
<value>163</value>
152152
</metadata>
153153
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
154154
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

‎project/MSBuildLogger/XmlLogger.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public XmlLogger()
2626
private string outputPath;
2727
private XmlDocument outputDoc;
2828
private XmlElement currentElement;
29-
private object lockObject = new object();
3029

3130
/// <summary>
3231
/// Initializes the logger by attaching events and parsing command line.
@@ -126,18 +125,12 @@ private void eventSource_TaskFinishedHandler(object sender, TaskFinishedEventArg
126125

127126
private void eventSource_WarningRaised(object sender, BuildWarningEventArgs e)
128127
{
129-
lock (lockObject)
130-
{
131-
LogErrorOrWarning(XmlLoggerElements.Warning, e.Message, e.Code, e.File, e.LineNumber, e.ColumnNumber, e.Timestamp);
132-
}
128+
LogErrorOrWarning(XmlLoggerElements.Warning, e.Message, e.Code, e.File, e.LineNumber, e.ColumnNumber, e.Timestamp);
133129
}
134130

135131
private void eventSource_ErrorRaised(object sender, BuildErrorEventArgs e)
136132
{
137-
lock (lockObject)
138-
{
139-
LogErrorOrWarning(XmlLoggerElements.Error, e.Message, e.Code, e.File, e.LineNumber, e.ColumnNumber, e.Timestamp);
140-
}
133+
LogErrorOrWarning(XmlLoggerElements.Error, e.Message, e.Code, e.File, e.LineNumber, e.ColumnNumber, e.Timestamp);
141134
}
142135

143136
private void eventSource_MessageHandler(object sender, BuildMessageEventArgs e)

‎project/UnitTests/Core/Tasks/FinalBuilderTaskTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ public void FinalBuilderIsNotInstalled()
166166
{
167167
ExpectThatExecuteWillNotBeCalled();
168168
_mockRegistry.ExpectAndReturn("GetLocalMachineSubKeyValue", null, @"SOFTWARE\VSoft\FinalBuilder\5.0", "Location");
169-
_mockRegistry.ExpectAndReturn("GetLocalMachineSubKeyValue", null, @"SOFTWARE\Wow6432Node\VSoft\FinalBuilder\5.0", "Location");
170-
171169
_task.ProjectFile = @"C:\Dummy\Project.fbz5";
172170
Assert.That(delegate { _task.Run(_result); },
173171
Throws.TypeOf<BuilderException>().With.Message.EqualTo("Path to Finalbuilder 5 command line executable could not be found."));

‎project/core/label/AssemblyVersionLabeller.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ namespace ThoughtWorks.CruiseControl.Core.Label
1212
/// </summary>
1313
/// <title>Assembly Version Labeller</title>
1414
/// <version>1.4.4</version>
15-
/// <remarks>This labeller will not generate revision version numbers until a commit-triggered build is performed.
16-
/// A forced build re-uses the revision number from last commit (which defaults to 1 if no commits were yet performed
17-
/// after enabling this labeller).</remarks>
1815
/// <example>
1916
/// <code title="Minimalist Example">
2017
/// &lt;labeller type="assemblyVersionLabeller" /&gt;

‎project/core/publishers/RssPublisher.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private XmlElement BuildIntegrationElement(XmlDocument ownerDocument, IIntegrati
187187
integrationElement.AppendChild(CreateTextElement(
188188
integrationElement.OwnerDocument, "guid", System.Guid.NewGuid().ToString()));
189189
integrationElement.AppendChild(CreateTextElement(
190-
integrationElement.OwnerDocument, "pubDate", System.DateTime.Now.ToUniversalTime().ToString("r", CultureInfo.CurrentCulture)));
190+
integrationElement.OwnerDocument, "pubDate", System.DateTime.Now.ToString("r", CultureInfo.CurrentCulture)));
191191

192192
if (result.HasModifications())
193193
{

0 commit comments

Comments
 (0)