From 937fc423ad7e9284ba700658eb42e0cdc328953c Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 8 Jan 2013 13:27:16 -0100 Subject: [PATCH] Change word deprecated to obsolete --- .../config/ClientDependency.config | 2 +- src/Umbraco.Web.UI/config/Dashboard.config | 8 ++ src/Umbraco.Web.UI/config/UrlRewriting.config | 3 +- .../config/xsltExtensions.config | 8 +- .../umbracobase/baseLibrary.cs | 20 ++--- src/umbraco.cms/businesslogic/CMSNode.cs | 2 +- src/umbraco.cms/businesslogic/Content.cs | 6 +- src/umbraco.cms/businesslogic/ContentType.cs | 2 +- .../businesslogic/datatype/DefaultData.cs | 2 +- src/umbraco.cms/businesslogic/media/Media.cs | 30 ++++---- .../businesslogic/media/MediaType.cs | 8 +- .../businesslogic/member/Member.cs | 4 +- .../businesslogic/template/Template.cs | 2 +- src/umbraco.cms/businesslogic/web/Document.cs | 76 +++++++++---------- .../businesslogic/web/DocumentType.cs | 26 +++---- .../tinymce/TinyMCEDataType.cs | 2 +- 16 files changed, 107 insertions(+), 94 deletions(-) diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index d6edcff895..46c024aac7 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config index 7588d58311..3a7440a233 100644 --- a/src/Umbraco.Web.UI/config/Dashboard.config +++ b/src/Umbraco.Web.UI/config/Dashboard.config @@ -112,4 +112,12 @@ /usercontrols/blog/CommentModeration.ascx +
+ + content + + + /usercontrols/blog/CommentModeration.ascx + +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/UrlRewriting.config b/src/Umbraco.Web.UI/config/UrlRewriting.config index 05ffe1eeb6..20e84a9dcc 100644 --- a/src/Umbraco.Web.UI/config/UrlRewriting.config +++ b/src/Umbraco.Web.UI/config/UrlRewriting.config @@ -28,5 +28,6 @@ Any bugs or problems with the rewriter, contact Anders/Duckie --> + - + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/xsltExtensions.config b/src/Umbraco.Web.UI/config/xsltExtensions.config index 58a11e1d5f..354f37fd64 100644 --- a/src/Umbraco.Web.UI/config/xsltExtensions.config +++ b/src/Umbraco.Web.UI/config/xsltExtensions.config @@ -1,4 +1,4 @@ - + @@ -8,4 +8,8 @@ - + + + + + \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs index 9def6a0c77..888280df77 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs @@ -17,26 +17,26 @@ using umbraco.cms.businesslogic.property; namespace umbraco.presentation.umbracobase.library { - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.")] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.")] public class library { - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMember().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMember().", false)] public static Member GetCurrentMember() { return Member.GetCurrentMember(); } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberId().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberId().", false)] public static int CurrentMemberId() { return Member.CurrentMemberId(); } } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.")] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.")] public class member { - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.Login(login, password).", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.Login(login, password).", false)] public static int login(string loginname, string password) { Member m = Member.GetMemberFromLoginNameAndPassword(loginname, password); @@ -56,7 +56,7 @@ namespace umbraco.presentation.umbracobase.library return library.CurrentMemberId(); } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.Logout().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.Logout().", false)] public static int logout() { Member m = library.GetCurrentMember(); @@ -70,7 +70,7 @@ namespace umbraco.presentation.umbracobase.library return 0; } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.Logout().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.Logout().", false)] public static int logout(int NodeId) { int _currentMemberId = library.CurrentMemberId(); @@ -84,7 +84,7 @@ namespace umbraco.presentation.umbracobase.library return 0; } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberAsXml().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberAsXml().", false)] public static XPathNodeIterator data() { if (library.GetCurrentMember() != null) @@ -98,13 +98,13 @@ namespace umbraco.presentation.umbracobase.library return null; } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberId().", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.GetCurrentMemberId().", false)] public static int id() { return library.CurrentMemberId(); } - [Obsolete("Deprecated, use Umbraco.Web.BaseRest.MemberRest.SetProperty(alias, value).", false)] + [Obsolete("Obsolete, use Umbraco.Web.BaseRest.MemberRest.SetProperty(alias, value).", false)] public static string setProperty(string alias, object value) { string retVal = "False"; diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs index 24459e7f04..4168dd4f62 100644 --- a/src/umbraco.cms/businesslogic/CMSNode.cs +++ b/src/umbraco.cms/businesslogic/CMSNode.cs @@ -29,7 +29,7 @@ namespace umbraco.cms.businesslogic /// The child classes are required to implement an identifier (Guid) which is used as the objecttype identifier, for /// distinguishing the different types of CMSNodes (ex. Documents/Medias/Stylesheets/documenttypes and so forth). /// - [Obsolete("Deprecated, This class will eventually be phased out", false)] + [Obsolete("Obsolete, This class will eventually be phased out", false)] public class CMSNode : BusinessLogic.console.IconI { #region Private Members diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs index dfc0b544eb..7b3e966874 100644 --- a/src/umbraco.cms/businesslogic/Content.cs +++ b/src/umbraco.cms/businesslogic/Content.cs @@ -26,7 +26,7 @@ namespace umbraco.cms.businesslogic /// Note that Content data in umbraco is *not* tablular but in a treestructure. /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.Content or Umbraco.Core.Models.Media", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.Content or Umbraco.Core.Models.Media", false)] public class Content : CMSNode { #region Private Members @@ -70,7 +70,7 @@ namespace umbraco.cms.businesslogic /// /// The ContentType /// A list of Content objects sharing the ContentType defined. - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetContentOfContentType() or Umbraco.Core.Services.MediaService.GetMediaOfMediaType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentOfContentType() or Umbraco.Core.Services.MediaService.GetMediaOfMediaType()", false)] public static Content[] getContentOfContentType(ContentType ct) { var list = new List(); @@ -88,7 +88,7 @@ namespace umbraco.cms.businesslogic /// /// The version identifier /// The Content object from the given version - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetByIdVersion() or Umbraco.Core.Services.MediaService.GetByIdVersion()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetByIdVersion() or Umbraco.Core.Services.MediaService.GetByIdVersion()", false)] public static Content GetContentFromVersion(Guid version) { var content = ApplicationContext.Current.Services.ContentService.GetByVersion(version); diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs index 529fefb11a..4cc0c38e13 100644 --- a/src/umbraco.cms/businesslogic/ContentType.cs +++ b/src/umbraco.cms/businesslogic/ContentType.cs @@ -25,7 +25,7 @@ namespace umbraco.cms.businesslogic /// Besides data definition, the ContentType also defines the sorting and grouping (in tabs) of Properties/Datafields /// on the Content and which Content (by ContentType) can be created as child to the Content of the ContentType. /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.ContentType or Umbraco.Core.Models.MediaType", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.ContentType or Umbraco.Core.Models.MediaType", false)] public class ContentType : CMSNode { #region Constructors diff --git a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs index 1d15edfcad..82212664d7 100644 --- a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs +++ b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs @@ -24,7 +24,7 @@ namespace umbraco.cms.businesslogic.datatype private Guid? _version = null; private int? _nodeId = null; - [Obsolete("Deprecated, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)] + [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)] protected static ISqlHelper SqlHelper { get { return Application.SqlHelper; } diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs index 9328bbf4fb..614da7d75e 100644 --- a/src/umbraco.cms/businesslogic/media/Media.cs +++ b/src/umbraco.cms/businesslogic/media/Media.cs @@ -14,7 +14,7 @@ namespace umbraco.cms.businesslogic.media /// /// By inheriting the Content class it has a generic datafields which enables custumization /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.Media", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.Media", false)] public class Media : Content { #region Constants and static members @@ -73,7 +73,7 @@ namespace umbraco.cms.businesslogic.media /// The user creating the media /// The id of the folder under which the media is created /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.CreateMedia()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.CreateMedia()", false)] public static Media MakeNew(string Name, MediaType dct, BusinessLogic.User u, int ParentId) { var media = ApplicationContext.Current.Services.MediaService.CreateMedia(ParentId, dct.Alias, u.Id); @@ -100,7 +100,7 @@ namespace umbraco.cms.businesslogic.media /// Retrieve a list of all toplevel medias and folders /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.GetRootMedia()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetRootMedia()", false)] public static Media[] GetRootMedias() { var children = ApplicationContext.Current.Services.MediaService.GetRootMedia(); @@ -117,7 +117,7 @@ namespace umbraco.cms.businesslogic.media return retval;*/ } - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.GetChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetChildren()", false)] public static List GetChildrenForTree(int nodeId) { var children = ApplicationContext.Current.Services.MediaService.GetChildren(nodeId); @@ -144,7 +144,7 @@ namespace umbraco.cms.businesslogic.media return tmp;*/ } - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.GetMediaOfMediaType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetMediaOfMediaType()", false)] public static IEnumerable GetMediaOfMediaType(int mediaTypeId) { var children = ApplicationContext.Current.Services.MediaService.GetMediaOfMediaType(mediaTypeId); @@ -174,7 +174,7 @@ namespace umbraco.cms.businesslogic.media /// Use with care. /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.DeleteMediaOfType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.DeleteMediaOfType()", false)] public static void DeleteFromType(MediaType dt) { ApplicationContext.Current.Services.MediaService.DeleteMediaOfType(dt.Id); @@ -270,7 +270,7 @@ namespace umbraco.cms.businesslogic.media /// /// Retrieve a list of all medias underneath the current /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.GetChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetChildren()", false)] public new Media[] Children { get @@ -289,7 +289,7 @@ namespace umbraco.cms.businesslogic.media /// /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.Save()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Save()", false)] public override void Save() { SaveEventArgs e = new SaveEventArgs(); @@ -327,7 +327,7 @@ namespace umbraco.cms.businesslogic.media /// /// Moves the media to the trash /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] public override void delete() { MoveToTrash(); @@ -337,7 +337,7 @@ namespace umbraco.cms.businesslogic.media /// With either move the media to the trash or permanently remove it from the database. /// /// flag to set whether or not to completely remove it from the database or just send to trash - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.Delete() or Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Delete() or Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] public void delete(bool deletePermanently) { if (!deletePermanently) @@ -350,7 +350,7 @@ namespace umbraco.cms.businesslogic.media } } - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.GetDescendants()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.GetDescendants()", false)] public override IEnumerable GetDescendants() { var descendants = ApplicationContext.Current.Services.MediaService.GetDescendants(Id); @@ -378,7 +378,7 @@ namespace umbraco.cms.businesslogic.media SetupNode(media); } - [Obsolete("Deprecated, This method is no longer used")] + [Obsolete("Obsolete, This method is no longer used")] protected void PopulateMediaFromReader(IRecordsReader dr) { var hc = dr.GetInt("children") > 0; @@ -414,7 +414,7 @@ namespace umbraco.cms.businesslogic.media Version = MediaItem.Version; } - [Obsolete("Deprecated, This method is no longer needed", false)] + [Obsolete("Obsolete, This method is no longer needed", false)] private void SetupMediaForTree(Guid uniqueId, int level, int parentId, int user, string path, string text, DateTime createDate, string icon, bool hasChildren, string contentTypeAlias, string contentTypeThumb, string contentTypeDesc, int? masterContentType, int contentTypeId, bool isContainer) @@ -428,7 +428,7 @@ namespace umbraco.cms.businesslogic.media /// Used internally to permanently delete the data from the database /// /// returns true if deletion isn't cancelled - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.Delete()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Delete()", false)] private bool DeletePermanently() { DeleteEventArgs e = new DeleteEventArgs(); @@ -458,7 +458,7 @@ namespace umbraco.cms.businesslogic.media /// Used internally to move the node to the recyle bin /// /// Returns true if the move was not cancelled - [Obsolete("Deprecated, Use Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.MoveToRecycleBin()", false)] private bool MoveToTrash() { MoveToTrashEventArgs e = new MoveToTrashEventArgs(); diff --git a/src/umbraco.cms/businesslogic/media/MediaType.cs b/src/umbraco.cms/businesslogic/media/MediaType.cs index 5225972e79..f97bf50ad4 100644 --- a/src/umbraco.cms/businesslogic/media/MediaType.cs +++ b/src/umbraco.cms/businesslogic/media/MediaType.cs @@ -12,7 +12,7 @@ namespace umbraco.cms.businesslogic.media /// /// Due to the inheritance of the ContentType class,it enables definition of generic datafields on a Media. /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.MediaType", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.MediaType", false)] public class MediaType : ContentType { #region Constructors @@ -57,7 +57,7 @@ namespace umbraco.cms.businesslogic.media /// /// The alias of the MediaType /// The MediaType with the alias - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetMediaType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetMediaType()", false)] public static new MediaType GetByAlias(string Alias) { var mediaType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(Alias); @@ -76,7 +76,7 @@ namespace umbraco.cms.businesslogic.media } } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetMediaType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetMediaType()", false)] public static IEnumerable GetAllAsList() { var mediaTypes = ApplicationContext.Current.Services.ContentTypeService.GetAllMediaTypes(); @@ -89,7 +89,7 @@ namespace umbraco.cms.businesslogic.media /// The Umbraco user context /// The name of the MediaType /// The new MediaType - [Obsolete("Deprecated, Use Umbraco.Core.Models.MediaType and Umbraco.Core.Services.ContentTypeService.Save()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.MediaType and Umbraco.Core.Services.ContentTypeService.Save()", false)] public static MediaType MakeNew(BusinessLogic.User u, string Text) { var mediaType = new Umbraco.Core.Models.MediaType(-1) { Name = Text, Alias = Text, CreatorId = u.Id, Thumbnail = "folder.png", Icon = "folder.gif" }; diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index f9ca2f18df..0c6bb0e532 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -1048,7 +1048,7 @@ namespace umbraco.cms.businesslogic.member /// Can be used in the public website /// /// Member to remove - [Obsolete("Deprecated, use the RemoveMemberFromCache(int NodeId) instead", false)] + [Obsolete("Obsolete, use the RemoveMemberFromCache(int NodeId) instead", false)] public static void RemoveMemberFromCache(Member m) { RemoveMemberFromCache(m.Id); @@ -1071,7 +1071,7 @@ namespace umbraco.cms.businesslogic.member /// Can be used in the public website /// /// Member - [Obsolete("Deprecated, use the ClearMemberFromClient(int NodeId) instead", false)] + [Obsolete("Obsolete, use the ClearMemberFromClient(int NodeId) instead", false)] public static void ClearMemberFromClient(Member m) { diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs index c9c30d1622..f6220b7f27 100644 --- a/src/umbraco.cms/businesslogic/template/Template.cs +++ b/src/umbraco.cms/businesslogic/template/Template.cs @@ -18,7 +18,7 @@ namespace umbraco.cms.businesslogic.template /// /// Summary description for Template. /// - //[Obsolete("Deprecated, This class will eventually be phased out - Use Umbraco.Core.Models.Template", false)] + //[Obsolete("Obsolete, This class will eventually be phased out - Use Umbraco.Core.Models.Template", false)] public class Template : CMSNode { diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index b4840249ef..ea92bfc1f3 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -21,7 +21,7 @@ namespace umbraco.cms.businesslogic.web /// /// Pubished Documents are exposed to the runtime/the public website in a cached xml document. /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.Content", false)] public class Document : Content { #region Constructors @@ -325,7 +325,7 @@ namespace umbraco.cms.businesslogic.web /// The usercontext under which the action are performed /// The id of the parent to the document /// The newly created document - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.CreateContent()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.CreateContent()", false)] public static Document MakeNew(string Name, DocumentType dct, User u, int ParentId) { //allows you to cancel a document before anything goes to the DB @@ -371,7 +371,7 @@ namespace umbraco.cms.businesslogic.web /// /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetById()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetById()", false)] public static bool IsDocument(int nodeId) { bool isDoc = false; @@ -386,7 +386,7 @@ namespace umbraco.cms.businesslogic.web /// Used to get the firstlevel/root documents of the hierachy /// /// Root documents - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetRootContent()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetRootContent()", false)] public static Document[] GetRootDocuments() { var content = ApplicationContext.Current.Services.ContentService.GetRootContent(); @@ -411,13 +411,13 @@ namespace umbraco.cms.businesslogic.web /// Note: use with care: this method can result in wast amount of data being deleted. /// /// The type of which documents should be deleted - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.DeleteContentOfType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.DeleteContentOfType()", false)] public static void DeleteFromType(DocumentType dt) { ApplicationContext.Current.Services.ContentService.DeleteContentOfType(dt.Id); } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetContentOfContentType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentOfContentType()", false)] public static IEnumerable GetDocumentsOfDocumentType(int docTypeId) { var contents = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(docTypeId); @@ -435,7 +435,7 @@ namespace umbraco.cms.businesslogic.web /// /// The parentdocuments id /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetChildren()", false)] public static Document[] GetChildrenForTree(int NodeId) { var children = ApplicationContext.Current.Services.ContentService.GetChildren(NodeId).OrderBy(c => c.SortOrder); @@ -443,14 +443,14 @@ namespace umbraco.cms.businesslogic.web return list.ToArray(); } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetChildrenByName()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetChildrenByName()", false)] public static List GetChildrenBySearch(int NodeId, string searchString) { var children = ApplicationContext.Current.Services.ContentService.GetChildrenByName(NodeId, searchString); return children.Select(x => new Document(x)).ToList(); } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.RePublishAll()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.RePublishAll()", false)] public static void RePublishAll() { XmlDocument xd = new XmlDocument(); @@ -502,7 +502,7 @@ namespace umbraco.cms.businesslogic.web /// Retrieve a list of documents with an expirationdate greater than today /// /// A list of documents with expirationdates than today - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetContentForExpiration()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentForExpiration()", false)] public static Document[] GetDocumentsForExpiration() { var contents = ApplicationContext.Current.Services.ContentService.GetContentForExpiration(); @@ -513,7 +513,7 @@ namespace umbraco.cms.businesslogic.web /// Retrieve a list of documents with with releasedate greater than today /// /// Retrieve a list of documents with with releasedate greater than today - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetContentForRelease()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetContentForRelease()", false)] public static Document[] GetDocumentsForRelease() { var contents = ApplicationContext.Current.Services.ContentService.GetContentForRelease(); @@ -657,7 +657,7 @@ namespace umbraco.cms.businesslogic.web /// A document can be published yet not visible, because of one or more of its /// parents being unpublished. Use PathPublished to get a value indicating whether /// the node and all its parents are published, and therefore whether the node is visible. - [Obsolete("Deprecated, Use Published property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use Published property on Umbraco.Core.Models.Content", false)] public bool Published { get { return _published; } @@ -674,7 +674,7 @@ namespace umbraco.cms.businesslogic.web /// /// Gets a value indicating whether the document and all its parents are published. /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.IsPublishable()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.IsPublishable()", false)] public bool PathPublished { get @@ -683,7 +683,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use Name property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use Name property on Umbraco.Core.Models.Content", false)] public override string Text { get @@ -706,7 +706,7 @@ namespace umbraco.cms.businesslogic.web /// /// The date of the last update of the document /// - [Obsolete("Deprecated, Use UpdateDate property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use UpdateDate property on Umbraco.Core.Models.Content", false)] public DateTime UpdateDate { get { return _updated; } @@ -723,7 +723,7 @@ namespace umbraco.cms.businesslogic.web /// /// A datestamp which indicates when a document should be published, used in automated publish/unpublish scenarios /// - [Obsolete("Deprecated, Use ReleaseDate property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use ReleaseDate property on Umbraco.Core.Models.Content", false)] public DateTime ReleaseDate { get { return _release; } @@ -737,7 +737,7 @@ namespace umbraco.cms.businesslogic.web /// /// A datestamp which indicates when a document should be unpublished, used in automated publish/unpublish scenarios /// - [Obsolete("Deprecated, Use ExpireDate property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use ExpireDate property on Umbraco.Core.Models.Content", false)] public DateTime ExpireDate { get { return _expire; } @@ -758,7 +758,7 @@ namespace umbraco.cms.businesslogic.web /// /// ?altTemplate=[templatealias] /// - [Obsolete("Deprecated, Use Template property on Umbraco.Core.Models.Content", false)] + [Obsolete("Obsolete, Use Template property on Umbraco.Core.Models.Content", false)] public int Template { get { return _template; } @@ -780,7 +780,7 @@ namespace umbraco.cms.businesslogic.web /// /// A collection of documents imidiately underneath this document ie. the childdocuments /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetChildren()", false)] public new Document[] Children { get @@ -827,7 +827,7 @@ namespace umbraco.cms.businesslogic.web /// the data. /// /// The usercontext under which the action are performed - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Publish()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)] public void Publish(User u) { SaveAndPublish(u); @@ -842,7 +842,7 @@ namespace umbraco.cms.businesslogic.web /// /// The usercontext under which the action are performed /// True if the publishing succeed. Possible causes for not publishing is if an event aborts the publishing - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Publish()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Publish()", false)] public bool PublishWithResult(User u) { var e = new PublishEventArgs(); @@ -863,7 +863,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)] public bool PublishWithChildrenWithResult(User u) { return ApplicationContext.Current.Services.ContentService.PublishWithChildren(Content, u.Id, true); @@ -875,7 +875,7 @@ namespace umbraco.cms.businesslogic.web /// /// The usercontext under which the action are performed /// The unique Id of the version to roll back to - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Rollback()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Rollback()", false)] public void RollBack(Guid VersionId, User u) { var e = new RollBackEventArgs(); @@ -895,7 +895,7 @@ namespace umbraco.cms.businesslogic.web /// Envoking this method will publish the documents and all children recursive. /// /// The usercontext under which the action are performed - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.PublishWithChildren()", false)] public void PublishWithSubs(User u) { PublishEventArgs e = new PublishEventArgs(); @@ -909,7 +909,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.UnPublish()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.UnPublish()", false)] public void UnPublish() { UnPublishEventArgs e = new UnPublishEventArgs(); @@ -927,7 +927,7 @@ namespace umbraco.cms.businesslogic.web /// /// Used to persist object changes to the database. /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Save()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Save()", false)] public override void Save() { var e = new SaveEventArgs(); @@ -989,7 +989,7 @@ namespace umbraco.cms.businesslogic.web return false; } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.HasPublishedVersion()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.HasPublishedVersion()", false)] public bool HasPublishedVersion() { return Content.HasPublishedVersion(); @@ -1001,7 +1001,7 @@ namespace umbraco.cms.businesslogic.web /// then this is considered a change. /// /// - [Obsolete("Deprecated, Instead of calling this just check if the latest version of the content is published", false)] + [Obsolete("Obsolete, Instead of calling this just check if the latest version of the content is published", false)] public bool HasPendingChanges() { return Content.Published == false; @@ -1011,7 +1011,7 @@ namespace umbraco.cms.businesslogic.web /// Used for rolling back documents to a previous version /// /// Previous published versions of the document - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetVersions()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetVersions()", false)] public DocumentVersionList[] GetVersions() { var versions = ApplicationContext.Current.Services.ContentService.GetVersions(Id); @@ -1024,7 +1024,7 @@ namespace umbraco.cms.businesslogic.web /// Returns the published version of this document /// /// The published version of this document - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetPublishedVersion()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetPublishedVersion()", false)] public DocumentVersionList GetPublishedVersion() { var version = ApplicationContext.Current.Services.ContentService.GetPublishedVersion(Id); @@ -1058,7 +1058,7 @@ namespace umbraco.cms.businesslogic.web /// /// The parentid where the document should be copied to /// The usercontext under which the action are performed - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Copy()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Copy()", false)] public Document Copy(int CopyTo, User u) { return Copy(CopyTo, u, false); @@ -1071,7 +1071,7 @@ namespace umbraco.cms.businesslogic.web /// /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Copy()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Copy()", false)] public Document Copy(int CopyTo, User u, bool RelateToOrignal) { var e = new CopyEventArgs(); @@ -1100,7 +1100,7 @@ namespace umbraco.cms.businesslogic.web /// /// Puts the current document in the trash /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] public override void delete() { MoveToTrash(); @@ -1110,7 +1110,7 @@ namespace umbraco.cms.businesslogic.web /// With either move the document to the trash or permanently remove it from the database. /// /// flag to set whether or not to completely remove it from the database or just send to trash - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Delete() or Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Delete() or Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] public void delete(bool deletePermanently) { if (!deletePermanently) @@ -1127,7 +1127,7 @@ namespace umbraco.cms.businesslogic.web /// Returns all decendants of the current document /// /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.GetDescendants()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.GetDescendants()", false)] public override IEnumerable GetDescendants() { var descendants = Content == null @@ -1142,7 +1142,7 @@ namespace umbraco.cms.businesslogic.web /// /// The source xmldocument /// The previous xmlrepresentation of the document - [Obsolete("Deprecated, Doesn't appear to be used anywhere", false)] + [Obsolete("Obsolete, Doesn't appear to be used anywhere", false)] public void XmlNodeRefresh(XmlDocument xd, ref XmlNode x) { x.Attributes.RemoveAll(); @@ -1486,7 +1486,7 @@ namespace umbraco.cms.businesslogic.web /// Used internally to permanently delete the data from the database /// /// returns true if deletion isn't cancelled - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.Delete()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Delete()", false)] private bool DeletePermanently() { DeleteEventArgs e = new DeleteEventArgs(); @@ -1518,7 +1518,7 @@ namespace umbraco.cms.businesslogic.web /// Used internally to move the node to the recyle bin /// /// Returns true if the move was not cancelled - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.MoveToRecycleBin()", false)] private bool MoveToTrash() { MoveToTrashEventArgs e = new MoveToTrashEventArgs(); diff --git a/src/umbraco.cms/businesslogic/web/DocumentType.cs b/src/umbraco.cms/businesslogic/web/DocumentType.cs index 715a045c37..882ba8d154 100644 --- a/src/umbraco.cms/businesslogic/web/DocumentType.cs +++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs @@ -18,7 +18,7 @@ namespace umbraco.cms.businesslogic.web /// /// Summary description for DocumentType. /// - [Obsolete("Deprecated, Use Umbraco.Core.Models.ContentType", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.ContentType", false)] public class DocumentType : ContentType { #region Constructors @@ -68,7 +68,7 @@ namespace umbraco.cms.businesslogic.web /// Generates the complete (simplified) XML DTD /// /// The DTD as a string - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetDtd()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetDtd()", false)] public static string GenerateDtd() { StringBuilder dtd = new StringBuilder(); @@ -83,7 +83,7 @@ namespace umbraco.cms.businesslogic.web return dtd.ToString(); } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetContentTypesDtd()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetContentTypesDtd()", false)] public static string GenerateXmlDocumentType() { StringBuilder dtd = new StringBuilder(); @@ -124,7 +124,7 @@ namespace umbraco.cms.businesslogic.web } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetContentType()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetContentType()", false)] public new static DocumentType GetByAlias(string Alias) { try @@ -138,7 +138,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use Umbraco.Core.Models.ContentType and Umbraco.Core.Services.ContentTypeService.Save()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Models.ContentType and Umbraco.Core.Services.ContentTypeService.Save()", false)] public static DocumentType MakeNew(User u, string Text) { var contentType = new Umbraco.Core.Models.ContentType(-1) { Name = Text, Alias = Text, CreatorId = u.Id, Thumbnail = "folder.png", Icon = "folder.gif" }; @@ -161,7 +161,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.GetAllContentTypes()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.GetAllContentTypes()", false)] public static List GetAllAsList() { var contentTypes = ApplicationContext.Current.Services.ContentTypeService.GetAllContentTypes(); @@ -173,7 +173,7 @@ namespace umbraco.cms.businesslogic.web #endregion #region Public Properties - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.HasChildren()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.HasChildren()", false)] public override bool HasChildren { get @@ -191,7 +191,7 @@ namespace umbraco.cms.businesslogic.web } } - [Obsolete("Deprecated, Use SetDefaultTemplate() on Umbraco.Core.Models.ContentType", false)] + [Obsolete("Obsolete, Use SetDefaultTemplate() on Umbraco.Core.Models.ContentType", false)] public int DefaultTemplate { get { return _defaultTemplate; } @@ -211,7 +211,7 @@ namespace umbraco.cms.businesslogic.web /// /// Gets/sets the allowed templates for this document type. /// - [Obsolete("Deprecated, Use AllowedTemplates property on Umbraco.Core.Models.ContentType", false)] + [Obsolete("Obsolete, Use AllowedTemplates property on Umbraco.Core.Models.ContentType", false)] public template.Template[] allowedTemplates { get @@ -281,7 +281,7 @@ namespace umbraco.cms.businesslogic.web #region Public Methods - [Obsolete("Deprecated, Use RemoveTemplate() on Umbraco.Core.Models.ContentType", false)] + [Obsolete("Obsolete, Use RemoveTemplate() on Umbraco.Core.Models.ContentType", false)] public void RemoveTemplate(int templateId) { // remove if default template @@ -305,7 +305,7 @@ namespace umbraco.cms.businesslogic.web /// /// /// Throws an exception if trying to delete a document type that is assigned as a master document type - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.Delete()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.Delete()", false)] public override void delete() { DeleteEventArgs e = new DeleteEventArgs(); @@ -420,7 +420,7 @@ namespace umbraco.cms.businesslogic.web return doc; } - [Obsolete("Deprecated, Use SetDefaultTemplate(null) on Umbraco.Core.Models.ContentType", false)] + [Obsolete("Obsolete, Use SetDefaultTemplate(null) on Umbraco.Core.Models.ContentType", false)] public void RemoveDefaultTemplate() { _defaultTemplate = 0; @@ -435,7 +435,7 @@ namespace umbraco.cms.businesslogic.web /// /// Used to persist object changes to the database. In Version3.0 it's just a stub for future compatibility /// - [Obsolete("Deprecated, Use Umbraco.Core.Services.ContentTypeService.Save()", false)] + [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentTypeService.Save()", false)] public override void Save() { SaveEventArgs e = new SaveEventArgs(); diff --git a/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs b/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs index d30639eb18..0c3fc5e424 100644 --- a/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs +++ b/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs @@ -36,7 +36,7 @@ namespace umbraco.editorControls.tinymce public override string DataTypeName { - get { return "TinyMCE wysiwyg (deprecated, upgrade to tinymce v3!)"; } + get { return "TinyMCE wysiwyg (Obsolete, upgrade to tinymce v3!)"; } } public override umbraco.interfaces.IDataPrevalue PrevalueEditor