Remove Empty Statements

This commit is contained in:
abi
2020-02-02 01:43:15 +00:00
committed by Kenn Jacobsen
parent f00680bfe6
commit a7ad464b40
22 changed files with 65 additions and 69 deletions
+1 -1
View File
@@ -86,7 +86,7 @@ namespace Umbraco.Core.Cache
protected override void EnterWriteLock()
{
_locker.EnterWriteLock();;
_locker.EnterWriteLock();
}
protected override void ExitReadLock()
+1 -1
View File
@@ -41,7 +41,7 @@ namespace Umbraco.Core
internal void AddDateTime(DateTime d)
{
_writer.Write(d.Ticks);;
_writer.Write(d.Ticks);
}
internal void AddString(string s)
@@ -32,7 +32,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
if (string.IsNullOrEmpty(dataType.Configuration))
{
config.Format = "YYYY-MM-DD";
};
}
}
catch (Exception ex)
{
@@ -7,7 +7,7 @@ using Umbraco.Core.Services;
namespace Umbraco.Core.Packaging
{
internal class ConflictingPackageData
internal class ConflictingPackageData
{
private readonly IMacroService _macroService;
private readonly IFileService _fileService;
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Packaging
return stylesheetNodes
.Select(n =>
{
var xElement = n.Element("Name") ?? n.Element("name"); ;
var xElement = n.Element("Name") ?? n.Element("name");
if (xElement == null)
throw new FormatException("Missing \"Name\" element");
@@ -82,7 +82,7 @@ namespace Umbraco.Core.Packaging
{
var packagesXml = EnsureStorage(out _);
if (packagesXml?.Root == null)
yield break;;
yield break;
foreach (var packageXml in packagesXml.Root.Elements("package"))
yield return _parser.ToPackageDefinition(packageXml);
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Packaging
var updatedXml = _parser.ToXml(definition);
packageXml.ReplaceWith(updatedXml);
}
packagesXml.Save(packagesFile);
return true;
@@ -212,7 +212,7 @@ namespace Umbraco.Core.Packaging
compiledPackageXml.Save(packageXmlFileName);
// check if there's a packages directory below media
if (Directory.Exists(IOHelper.MapPath(_mediaFolderPath)) == false)
Directory.CreateDirectory(IOHelper.MapPath(_mediaFolderPath));
@@ -510,7 +510,6 @@ namespace Umbraco.Core.Packaging
private XElement GetStylesheetXml(string name, bool includeProperties)
{
if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(name));
;
var sts = _fileService.GetStylesheetByName(name);
if (sts == null) return null;
var stylesheetXml = new XElement("Stylesheet");
@@ -562,7 +561,7 @@ namespace Umbraco.Core.Packaging
package.Add(new XElement("url", definition.Url));
var requirements = new XElement("requirements");
requirements.Add(new XElement("major", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Major.ToInvariantString() : definition.UmbracoVersion.Major.ToInvariantString()));
requirements.Add(new XElement("minor", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Minor.ToInvariantString() : definition.UmbracoVersion.Minor.ToInvariantString()));
requirements.Add(new XElement("patch", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Patch.ToInvariantString() : definition.UmbracoVersion.Build.ToInvariantString()));
@@ -589,7 +588,7 @@ namespace Umbraco.Core.Packaging
contributors.Add(new XElement("contributor", contributor));
}
}
info.Add(contributors);
info.Add(new XElement("readme", new XCData(definition.Readme)));
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
if (macroDto == null)
return null;
var entity = MacroFactory.BuildEntity(macroDto);
// reset dirty initial properties (U4-1946)
@@ -153,7 +153,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
protected override void PersistUpdatedItem(IMacro entity)
{
entity.UpdatingEntity();
;
var dto = MacroFactory.BuildDto(entity);
Database.Update(dto);
@@ -215,7 +215,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
//Save updated entity to db
template.UpdateDate = DateTime.Now;
;
var dto = TemplateFactory.BuildDto(template, NodeObjectTypeId, templateDto.PrimaryKey);
Database.Update(dto.NodeDto);
+3 -3
View File
@@ -214,9 +214,9 @@ namespace Umbraco.Core.Xml
var xmlDoc = new XmlDocument();
//Load the file into the XmlDocument
xmlDoc.Load(reader);
return xmlDoc;
}
}
}
/// <summary>
@@ -335,7 +335,7 @@ namespace Umbraco.Core.Xml
var child = parent.SelectSingleNode(name);
if (child != null)
{
child.InnerXml = "<![CDATA[" + value + "]]>"; ;
child.InnerXml = "<![CDATA[" + value + "]]>";
return child;
}
return AddCDataNode(xd, name, value);
@@ -68,7 +68,7 @@ namespace Umbraco.TestData
scope.Complete();
}
return Content("Done");
}
@@ -89,7 +89,7 @@ namespace Umbraco.TestData
message = "Count not high enough for specified for number of levels required";
return false;
}
return true;
}
@@ -140,7 +140,7 @@ namespace Umbraco.TestData
currChildCount = prev.childCount;
// restore the parent
parent = prev.parent;
}
else if (contentItem.Level < depth)
{
@@ -149,10 +149,10 @@ namespace Umbraco.TestData
// not at max depth, create below
parent = created.container();
currChildCount = 0;
}
}
}
@@ -219,7 +219,7 @@ namespace Umbraco.TestData
{
var content = Services.ContentService.Create(faker.Commerce.ProductName(), currParent, docType.Alias);
content.SetValue("review", faker.Rant.Review());
content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective()))); ;
content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective())));
content.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
Services.ContentService.Save(content);
@@ -259,7 +259,7 @@ namespace Umbraco.TestData
return docType;
}
private IDataType GetOrCreateRichText() => GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);
private IDataType GetOrCreateRichText() => GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);
private IDataType GetOrCreateMediaPicker() => GetOrCreateDataType(MediaPickerDataTypeName, Constants.PropertyEditors.Aliases.MediaPicker);
+1 -1
View File
@@ -163,7 +163,7 @@ namespace Umbraco.Tests.Logging
//Query @Level='Warning' BUT we pass in array of LogLevels for Debug & Info (Expect to get 0 results)
string[] logLevelMismatch = { "Debug", "Information" };
var filterLevelQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: "@Level='Warning'", logLevels: logLevelMismatch); ;
var filterLevelQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: "@Level='Warning'", logLevels: logLevelMismatch);
Assert.AreEqual(0, filterLevelQuery.TotalItems);
}
@@ -38,7 +38,6 @@ namespace Umbraco.Tests.Persistence.Repositories
var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>());
var macro = new Macro("test1", "Test", "~/views/macropartials/test.cshtml", MacroTypes.PartialView);
;
Assert.Throws<SqlCeException>(() => repository.Save(macro));
}
@@ -56,7 +55,7 @@ namespace Umbraco.Tests.Persistence.Repositories
var macro = repository.Get(1);
macro.Alias = "test2";
Assert.Throws<SqlCeException>(() => repository.Save(macro));
}
@@ -29,13 +29,13 @@
@* a single image *@
if (media.IsDocumentType("Image"))
{
@Render(media);
@Render(media)
}
@* a folder with images under it *@
foreach (var image in media.Children())
{
@Render(image);
@Render(image)
}
}
</div>
@@ -2,31 +2,31 @@
@using Umbraco.Web.Templates
@using Newtonsoft.Json.Linq
@*
@*
Razor helpers located at the bottom of this file
*@
@if (Model != null && Model.sections != null)
{
var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
<div class="umb-grid">
@if (oneColumn)
{
foreach (var section in Model.sections) {
<div class="grid-section">
@foreach (var row in section.rows) {
@renderRow(row);
@renderRow(row)
}
</div>
}
}else {
}
}else {
<div class="row clearfix">
@foreach (var s in Model.sections) {
<div class="grid-section">
<div class="col-md-@s.grid column">
@foreach (var row in s.rows) {
@renderRow(row);
@renderRow(row)
}
</div>
</div>
@@ -85,4 +85,4 @@
return new MvcHtmlString(string.Join(" ", attrs));
}
}
}
@@ -12,7 +12,7 @@
foreach (var section in Model.sections) {
<div class="grid-section">
@foreach (var row in section.rows) {
@renderRow(row, true);
@renderRow(row, true)
}
</div>
}
@@ -23,7 +23,7 @@
<div class="grid-section">
<div class="col-md-@s.grid column">
@foreach (var row in s.rows) {
@renderRow(row, false);
@renderRow(row, false)
}
</div>
</div>
+1 -1
View File
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Cache
{
macroRepoCache.Result.Clear(RepositoryCacheKeys.GetKey<IMacro>(payload.Id));
}
};
}
base.Refresh(json);
}
@@ -427,7 +427,7 @@ namespace Umbraco.Web.Editors
{
var propertyEditor = propertyEditors.SingleOrDefault(x => x.Alias == dataType.Alias);
if (propertyEditor != null)
dataType.HasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any(); ;
dataType.HasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any();
}
var grouped = dataTypes
@@ -102,8 +102,8 @@ namespace Umbraco.Web.Editors
model.LicenseUrl = ins.LicenseUrl;
model.Readme = ins.Readme;
model.ConflictingMacroAliases = ins.Warnings.ConflictingMacros.ToDictionary(x => x.Name, x => x.Alias);
model.ConflictingStyleSheetNames = ins.Warnings.ConflictingStylesheets.ToDictionary(x => x.Name, x => x.Alias); ;
model.ConflictingTemplateAliases = ins.Warnings.ConflictingTemplates.ToDictionary(x => x.Name, x => x.Alias); ;
model.ConflictingStyleSheetNames = ins.Warnings.ConflictingStylesheets.ToDictionary(x => x.Name, x => x.Alias);
model.ConflictingTemplateAliases = ins.Warnings.ConflictingTemplates.ToDictionary(x => x.Name, x => x.Alias);
model.ContainsUnsecureFiles = ins.Warnings.UnsecureFiles.Any();
model.Url = ins.Url;
model.Version = ins.Version;
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Media.Exif
public ExifBitConverter(ByteOrder from, ByteOrder to)
: base(from, to)
{
;
}
#endregion
@@ -28,7 +28,7 @@ namespace Umbraco.Web.Media.Exif
public ExifEnumProperty(ExifTag tag, T value)
: this(tag, value, false)
{
;
}
public override ExifInterOperability Interoperability
@@ -210,13 +210,13 @@ namespace Umbraco.Web.Media.Exif
public ExifPointSubjectArea(ExifTag tag, ushort[] value)
: base(tag, value)
{
;
}
public ExifPointSubjectArea(ExifTag tag, ushort x, ushort y)
: base(tag, new ushort[] { x, y })
: base(tag, new ushort[] {x, y})
{
;
}
}
@@ -239,13 +239,13 @@ namespace Umbraco.Web.Media.Exif
public ExifCircularSubjectArea(ExifTag tag, ushort[] value)
: base(tag, value)
{
;
}
public ExifCircularSubjectArea(ExifTag tag, ushort x, ushort y, ushort d)
: base(tag, new ushort[] { x, y, d })
{
;
}
}
@@ -269,13 +269,13 @@ namespace Umbraco.Web.Media.Exif
public ExifRectangularSubjectArea(ExifTag tag, ushort[] value)
: base(tag, value)
{
;
}
public ExifRectangularSubjectArea(ExifTag tag, ushort x, ushort y, ushort w, ushort h)
: base(tag, new ushort[] { x, y, w, h })
{
;
}
}
@@ -303,13 +303,13 @@ namespace Umbraco.Web.Media.Exif
public GPSLatitudeLongitude(ExifTag tag, MathEx.UFraction32[] value)
: base(tag, value)
{
;
}
public GPSLatitudeLongitude(ExifTag tag, float d, float m, float s)
: base(tag, new MathEx.UFraction32[] { new MathEx.UFraction32(d), new MathEx.UFraction32(m), new MathEx.UFraction32(s) })
{
;
}
}
@@ -331,13 +331,13 @@ namespace Umbraco.Web.Media.Exif
public GPSTimeStamp(ExifTag tag, MathEx.UFraction32[] value)
: base(tag, value)
{
;
}
public GPSTimeStamp(ExifTag tag, float h, float m, float s)
: base(tag, new MathEx.UFraction32[] { new MathEx.UFraction32(h), new MathEx.UFraction32(m), new MathEx.UFraction32(s) })
{
;
}
}
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Media.Exif
public JFIFVersion(ExifTag tag, ushort value)
: base(tag, value)
{
;
}
public override string ToString()
+1 -1
View File
@@ -45,7 +45,7 @@
public JPEGSection(JPEGMarker marker)
: this(marker, new byte[0], new byte[0])
{
;
}
#endregion
+12 -12
View File
@@ -403,37 +403,37 @@ namespace Umbraco.Web.Media.Exif
public Fraction32(int numerator, int denominator)
: this(numerator, denominator, 0)
{
;
}
public Fraction32(int numerator)
: this(numerator, (int)1)
{
;
}
public Fraction32(Fraction32 f)
: this(f.Numerator, f.Denominator, f.Error)
{
;
}
public Fraction32(float value)
: this((double)value)
{
;
}
public Fraction32(double value)
: this(FromDouble(value))
{
;
}
public Fraction32(string s)
: this(FromString(s))
{
;
}
#endregion
@@ -1033,37 +1033,37 @@ namespace Umbraco.Web.Media.Exif
public UFraction32(uint numerator, uint denominator)
: this(numerator, denominator, 0)
{
;
}
public UFraction32(uint numerator)
: this(numerator, (uint)1)
{
;
}
public UFraction32(UFraction32 f)
: this(f.Numerator, f.Denominator, f.Error)
{
;
}
public UFraction32(float value)
: this((double)value)
{
;
}
public UFraction32(double value)
: this(FromDouble(value))
{
;
}
public UFraction32(string s)
: this(FromString(s))
{
;
}
#endregion