yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed IStyleSheet

Browse Source
This commit is contained in:
jakobdyrby
2014-06-10 08:47:41 +02:00
parent eef7ce45d3
commit dfb08b9ec7
10 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Packaging/ConflictingPackageContentFinder.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Core.Packaging
}
public IStylesheet[] FindConflictingStylesheets(XElement stylesheetNotes)
public IFile[] FindConflictingStylesheets(XElement stylesheetNotes)
{
if (string.Equals(Constants.Packaging.StylesheetsNodeName, stylesheetNotes.Name.LocalName) == false)
{
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Packaging
"stylesheetNotes");
}
return _fileService.GetStylesheetByName(xElement.Value) as IStylesheet;
return _fileService.GetStylesheetByName(xElement.Value) as IFile;
})
.Where(v => v != null).ToArray();
}

2
src/Umbraco.Core/Packaging/IConflictingPackageContentFinder.cs
View File

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Packaging
public interface IConflictingPackageContentFinder
{
IStylesheet[] FindConflictingStylesheets(XElement stylesheetNotes);
IFile[] FindConflictingStylesheets(XElement stylesheetNotes);
ITemplate[] FindConflictingTemplates(XElement templateNotes);
IMacro[] FindConflictingMacros(XElement macroNodes);
}

2
src/Umbraco.Core/Packaging/Models/InstallationSummary.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Packaging.Models
public Details<string>[] FilesInstalled { get; set; }
public ITemplate[] TemplatesInstalled { get; set; }
public IContentType[] DocumentTypesInstalled { get; set; }
public IStylesheet[] StylesheetsInstalled { get; set; }
public IFile[] StylesheetsInstalled { get; set; }
public IContent[] DocumentsInstalled { get; set; }
public PackageAction[] Actions { get; set; }
}

2
src/Umbraco.Core/Packaging/Models/PreInstallWarnings.cs
View File

@@ -7,6 +7,6 @@ namespace Umbraco.Core.Packaging.Models
public IFileInPackageInfo[] UnsecureFiles { get; set; }
public IMacro[] ConflictingMacroAliases { get; set; }
public ITemplate[] ConflictingTemplateAliases { get; set; }
public IStylesheet[] ConflictingStylesheetNames { get; set; }
public IFile[] ConflictingStylesheetNames { get; set; }
}
}

6
src/Umbraco.Core/Packaging/PackageInstallation.cs
View File

@@ -159,7 +159,7 @@ namespace Umbraco.Core.Packaging
var documentTypesInstalled = EmptyArrayIfNull<IContentType>(documentTypes) ?? InstallDocumentTypes(documentTypes, userId);
installationSummary.DocumentTypesInstalled =documentTypesInstalled;
var stylesheetsInstalled = EmptyArrayIfNull<IStylesheet>(styleSheets) ?? InstallStylesheets(styleSheets, userId);
var stylesheetsInstalled = EmptyArrayIfNull<IFile>(styleSheets) ?? InstallStylesheets(styleSheets, userId);
installationSummary.StylesheetsInstalled = stylesheetsInstalled;
var documentsInstalled = EmptyArrayIfNull<IContent>(documentSet) ?? InstallDocuments(documentSet, userId);
@@ -312,7 +312,7 @@ namespace Umbraco.Core.Packaging
return _packagingService.ImportContent(documentsElement, -1, userId).ToArray();
}
private IStylesheet[] InstallStylesheets(XElement styleSheetsElement, int userId = 0)
private IFile[] InstallStylesheets(XElement styleSheetsElement, int userId = 0)
{
if (string.Equals(Constants.Packaging.StylesheetsNodeName, styleSheetsElement.Name.LocalName) == false)
{
@@ -419,7 +419,7 @@ namespace Umbraco.Core.Packaging
ConflictingTemplateAliases =
templates == null ? new ITemplate[0] : ConflictingPackageContentFinder.FindConflictingTemplates(templates),
ConflictingStylesheetNames =
styleSheets == null ? new IStylesheet[0] : ConflictingPackageContentFinder.FindConflictingStylesheets(styleSheets)
styleSheets == null ? new IFile[0] : ConflictingPackageContentFinder.FindConflictingStylesheets(styleSheets)
};
return conflictingPackageContent;