LPS-60967 Cleanup unnecessary deprecation in Velocity

igorbeslic · Feb 11, 2016 · 61e068c · 61e068c
1 parent 9b01e53
commit 61e068c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 70 deletions.
diff --git a/util-taglib/src/com/liferay/taglib/util/DummyVelocityTaglib.java b/util-taglib/src/com/liferay/taglib/util/DummyVelocityTaglib.java
@@ -23,7 +23,6 @@
 import com.liferay.taglib.ui.AssetTagsSummaryTag;
 import com.liferay.taglib.ui.BreadcrumbTag;
 import com.liferay.taglib.ui.DiscussionTag;
-import com.liferay.taglib.ui.FlagsTag;
 import com.liferay.taglib.ui.IconTag;
 import com.liferay.taglib.ui.JournalArticleTag;
 import com.liferay.taglib.ui.MySitesTag;
@@ -144,12 +143,6 @@ public void discussion(
 	public void doAsURL(long doAsUserId) {
 	}
 
-	@Override
-	public void flags(
-		String className, long classPK, String contentTitle, boolean label,
-		String message, long reportedUserId) {
-	}
-
 	@Override
 	public AssetCategoriesSummaryTag<?> getAssetCategoriesSummaryTag() {
 		return null;
@@ -175,11 +168,6 @@ public DiscussionTag getDiscussionTag() {
 		return null;
 	}
 
-	@Override
-	public FlagsTag getFlagsTag() {
-		return null;
-	}
-
 	@Override
 	public IconTag getIconTag() {
 		return null;

diff --git a/util-taglib/src/com/liferay/taglib/util/VelocityTaglib.java b/util-taglib/src/com/liferay/taglib/util/VelocityTaglib.java
@@ -22,7 +22,6 @@
 import com.liferay.taglib.ui.AssetTagsSummaryTag;
 import com.liferay.taglib.ui.BreadcrumbTag;
 import com.liferay.taglib.ui.DiscussionTag;
-import com.liferay.taglib.ui.FlagsTag;
 import com.liferay.taglib.ui.IconTag;
 import com.liferay.taglib.ui.JournalArticleTag;
 import com.liferay.taglib.ui.MySitesTag;
@@ -118,16 +117,6 @@ public void discussion(
 
 	public void doAsURL(long doAsUserId) throws Exception;
 
-	/**
-	 * @deprecated As of 7.0.0, replaced by {@link
-	 *             com.liferay.flags.taglib.servlet.taglib.FlagsTag}
-	 */
-	@Deprecated
-	public void flags(
-			String className, long classPK, String contentTitle, boolean label,
-			String message, long reportedUserId)
-		throws Exception;
-
 	public AssetCategoriesSummaryTag<?> getAssetCategoriesSummaryTag()
 		throws Exception;
 
@@ -139,13 +128,6 @@ public AssetCategoriesSummaryTag<?> getAssetCategoriesSummaryTag()
 
 	public DiscussionTag getDiscussionTag() throws Exception;
 
-	/**
-	 * @deprecated As of 7.0.0, replaced by {@link
-	 *             com.liferay.flags.taglib.servlet.taglib.FlagsTag}
-	 */
-	@Deprecated
-	public FlagsTag getFlagsTag() throws Exception;
-
 	public IconTag getIconTag() throws Exception;
 
 	public JournalArticleTag getJournalArticleTag() throws Exception;

diff --git a/util-taglib/src/com/liferay/taglib/util/VelocityTaglibImpl.java b/util-taglib/src/com/liferay/taglib/util/VelocityTaglibImpl.java
@@ -43,7 +43,6 @@
 import com.liferay.taglib.ui.AssetTagsSummaryTag;
 import com.liferay.taglib.ui.BreadcrumbTag;
 import com.liferay.taglib.ui.DiscussionTag;
-import com.liferay.taglib.ui.FlagsTag;
 import com.liferay.taglib.ui.IconTag;
 import com.liferay.taglib.ui.JournalArticleTag;
 import com.liferay.taglib.ui.JournalContentSearchTag;
@@ -323,31 +322,6 @@ public void doAsURL(long doAsUserId) throws Exception {
 		DoAsURLTag.doTag(doAsUserId, _request);
 	}
 
-	/**
-	 * @deprecated As of 7.0.0, replaced by {@link
-	 *             com.liferay.flags.taglib.servlet.taglib.FlagsTag}
-	 */
-	@Deprecated
-	@Override
-	public void flags(
-			String className, long classPK, String contentTitle, boolean label,
-			String message, long reportedUserId)
-		throws Exception {
-
-		FlagsTag flagsTag = new FlagsTag();
-
-		setUp(flagsTag);
-
-		flagsTag.setClassName(className);
-		flagsTag.setClassPK(classPK);
-		flagsTag.setContentTitle(contentTitle);
-		flagsTag.setLabel(label);
-		flagsTag.setMessage(message);
-		flagsTag.setReportedUserId(reportedUserId);
-
-		flagsTag.runTag();
-	}
-
 	@Override
 	public AssetCategoriesSummaryTag<?> getAssetCategoriesSummaryTag()
 		throws Exception {
@@ -397,20 +371,6 @@ public DiscussionTag getDiscussionTag() throws Exception {
 		return discussionTag;
 	}
 
-	/**
-	 * @deprecated As of 7.0.0, replaced by {@link
-	 *             com.liferay.flags.taglib.servlet.taglib.FlagsTag}
-	 */
-	@Deprecated
-	@Override
-	public FlagsTag getFlagsTag() throws Exception {
-		FlagsTag flagsTag = new FlagsTag();
-
-		setUp(flagsTag);
-
-		return flagsTag;
-	}
-
 	@Override
 	public IconTag getIconTag() throws Exception {
 		IconTag iconTag = new IconTag();