LPS-54982 Ran ant format-source

xieh · Apr 15, 2015 · 5b590e6 · 5b590e6
1 parent 9e89006
commit 5b590e6
Show file tree

Hide file tree

Showing 93 changed files with 146 additions and 451 deletions.
diff --git a/...et-browser-web/src/com/liferay/asset/browser/web/portlet/AssetBrowserPortletProvider.java b/...et-browser-web/src/com/liferay/asset/browser/web/portlet/AssetBrowserPortletProvider.java
@@ -25,9 +25,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"model.class.name=" + PortletProvider.CLASS_NAME_ANY
-	},
+	property = {"model.class.name=" + PortletProvider.CLASS_NAME_ANY},
 	service = BrowsePortletProvider.class
 )
 public class AssetBrowserPortletProvider implements BrowsePortletProvider {

diff --git a/...test/test/integration/com/liferay/asset/publisher/lar/AssetPublisherExportImportTest.java b/...test/test/integration/com/liferay/asset/publisher/lar/AssetPublisherExportImportTest.java
@@ -113,9 +113,7 @@ public void testAnyDLFileEntryType() throws Exception {
 			new String[] {String.valueOf(dlFileEntryClassNameId)});
 		preferenceMap.put(
 			"anyClassTypeDLFileEntryAssetRendererFactory",
-			new String[] {
-				String.valueOf(Boolean.TRUE)
-			});
+			new String[] {String.valueOf(Boolean.TRUE)});
 
 		PortletPreferences portletPreferences = getImportedPortletPreferences(
 			preferenceMap);
@@ -146,9 +144,7 @@ public void testAnyJournalStructure() throws Exception {
 			new String[] {String.valueOf(journalArticleClassNameId)});
 		preferenceMap.put(
 			"anyClassTypeJournalArticleAssetRendererFactory",
-			new String[] {
-				String.valueOf(Boolean.TRUE)
-			});
+			new String[] {String.valueOf(Boolean.TRUE)});
 
 		PortletPreferences portletPreferences = getImportedPortletPreferences(
 			preferenceMap);
@@ -417,9 +413,7 @@ public void testOneJournalStructure() throws Exception {
 			new String[] {String.valueOf(journalArticleClassNameId)});
 		preferenceMap.put(
 			"anyClassTypeJournalArticleAssetRendererFactory",
-			new String[] {
-				String.valueOf(ddmStructure.getStructureId())
-			});
+			new String[] {String.valueOf(ddmStructure.getStructureId())});
 		preferenceMap.put(
 			"classTypeIds",
 			new String[] {String.valueOf(ddmStructure.getStructureId())});
@@ -498,9 +492,7 @@ public void testSeveralDLFileEntryTypes() throws Exception {
 
 		preferenceMap.put(
 			"anyClassTypeDLFileEntryAssetRendererFactory",
-			new String[] {
-				String.valueOf(Boolean.FALSE)
-			});
+			new String[] {String.valueOf(Boolean.FALSE)});
 
 		preferenceMap.put(
 			"classTypeIdsDLFileEntryAssetRendererFactory",
@@ -549,9 +541,7 @@ public void testSeveralJournalStructures() throws Exception {
 
 		preferenceMap.put(
 			"anyClassTypeJournalArticleAssetRendererFactory",
-			new String[] {
-				String.valueOf(Boolean.FALSE)
-			});
+			new String[] {String.valueOf(Boolean.FALSE)});
 
 		preferenceMap.put(
 			"classTypeIdsJournalArticleAssetRendererFactory",

diff --git a/...lisher-web/src/com/liferay/asset/publisher/web/portlet/AssetPublisherPortletProvider.java b/...lisher-web/src/com/liferay/asset/publisher/web/portlet/AssetPublisherPortletProvider.java
@@ -32,12 +32,8 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"model.class.name=" + PortletProvider.CLASS_NAME_ANY
-	},
-	service = {
-		AddPortletProvider.class, ViewPortletProvider.class
-	}
+	property = {"model.class.name=" + PortletProvider.CLASS_NAME_ANY},
+	service = {AddPortletProvider.class, ViewPortletProvider.class}
 )
 public class AssetPublisherPortletProvider
 	implements AddPortletProvider, ViewPortletProvider {

diff --git a/...gs-definition/src/com/liferay/blogs/ratings/definition/BlogsPortletRatingsDefinition.java b/...gs-definition/src/com/liferay/blogs/ratings/definition/BlogsPortletRatingsDefinition.java
@@ -24,9 +24,7 @@
  * @author Roberto Díaz
  */
 @Component(
-	property = {
-		"model.class.name=com.liferay.portlet.blogs.model.BlogsEntry"
-	}
+	property = {"model.class.name=com.liferay.portlet.blogs.model.BlogsEntry"}
 )
 public class BlogsPortletRatingsDefinition implements PortletRatingsDefinition {
 

diff --git a/...bookmarks-service/src/com/liferay/bookmarks/asset/BookmarksEntryAssetRendererFactory.java b/...bookmarks-service/src/com/liferay/bookmarks/asset/BookmarksEntryAssetRendererFactory.java
@@ -46,9 +46,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"search.asset.type=com.liferay.bookmarks.model.BookmarksEntry"
-	},
+	property = {"search.asset.type=com.liferay.bookmarks.model.BookmarksEntry"},
 	service = AssetRendererFactory.class
 )
 public class BookmarksEntryAssetRendererFactory

diff --git a/...ookmarks-service/src/com/liferay/bookmarks/ratings/BookmarksPortletRatingsDefinition.java b/...ookmarks-service/src/com/liferay/bookmarks/ratings/BookmarksPortletRatingsDefinition.java
@@ -24,9 +24,7 @@
  * @author Roberto Díaz
  */
 @Component(
-	property = {
-		"model.class.name=com.liferay.bookmarks.model.BookmarksEntry"
-	}
+	property = {"model.class.name=com.liferay.bookmarks.model.BookmarksEntry"}
 )
 public class BookmarksPortletRatingsDefinition
 	implements PortletRatingsDefinition {

diff --git a/...service/src/com/liferay/bookmarks/service/permission/BookmarksEntryPermissionChecker.java b/...service/src/com/liferay/bookmarks/service/permission/BookmarksEntryPermissionChecker.java
@@ -36,9 +36,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"model.class.name=com.liferay.bookmarks.model.BookmarksEntry"
-	}
+	property = {"model.class.name=com.liferay.bookmarks.model.BookmarksEntry"}
 )
 public class BookmarksEntryPermissionChecker
 	implements BaseModelPermissionChecker {

diff --git a/...ervice/src/com/liferay/bookmarks/service/permission/BookmarksFolderPermissionChecker.java b/...ervice/src/com/liferay/bookmarks/service/permission/BookmarksFolderPermissionChecker.java
@@ -35,9 +35,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"model.class.name=com.liferay.bookmarks.model.BookmarksFolder"
-	}
+	property = {"model.class.name=com.liferay.bookmarks.model.BookmarksFolder"}
 )
 public class BookmarksFolderPermissionChecker
 	implements BaseModelPermissionChecker {

diff --git a/...editor-config/src/com/liferay/comments/editor/config/CommentsEditorConfigContributor.java b/...editor-config/src/com/liferay/comments/editor/config/CommentsEditorConfigContributor.java
@@ -29,9 +29,7 @@
  * @author Ambrin Chaudhary
  */
 @Component(
-	property = {
-		"editor.config.key=commentsEditor", "service.ranking:Integer=0"
-	}
+	property = {"editor.config.key=commentsEditor", "service.ranking:Integer=0"}
 )
 public class CommentsEditorConfigContributor
 	implements EditorConfigContributor {

diff --git a/...r/test/unit/com/liferay/dynamic/data/mapping/form/renderer/DDMFormRendererHelperTest.java b/...r/test/unit/com/liferay/dynamic/data/mapping/form/renderer/DDMFormRendererHelperTest.java
@@ -377,9 +377,7 @@ protected String renderTextField(
 
 		return StringUtil.replace(
 			_INPUT_FIELD_TEMPLATE,
-			new String[] {
-				"$childElementsHTML", "$name", "$value"
-			},
+			new String[] {"$childElementsHTML", "$name", "$value"},
 			new String[] {
 				ddmFormFieldRenderingContext.getChildElementsHTML(),
 				ddmFormFieldRenderingContext.getName(),

diff --git a/...type-checkbox/src/com/liferay/dynamic/data/mapping/type/CheckboxDDMFormFieldRenderer.java b/...type-checkbox/src/com/liferay/dynamic/data/mapping/type/CheckboxDDMFormFieldRenderer.java
@@ -39,9 +39,7 @@
 @Component(
 	immediate = true,
 	property = {"templatePath=/META-INF/resources/checkbox.soy"},
-	service = {
-		CheckboxDDMFormFieldRenderer.class, DDMFormFieldRenderer.class
-	}
+	service = {CheckboxDDMFormFieldRenderer.class, DDMFormFieldRenderer.class}
 )
 public class CheckboxDDMFormFieldRenderer extends BaseDDMFormFieldRenderer {
 

diff --git a/...mapping-type-text/src/com/liferay/dynamic/data/mapping/type/TextDDMFormFieldRenderer.java b/...mapping-type-text/src/com/liferay/dynamic/data/mapping/type/TextDDMFormFieldRenderer.java
@@ -31,9 +31,7 @@
  */
 @Component(
 	immediate = true, property = {"templatePath=/META-INF/resources/text.soy"},
-	service = {
-		TextDDMFormFieldRenderer.class, DDMFormFieldRenderer.class
-	}
+	service = {TextDDMFormFieldRenderer.class, DDMFormFieldRenderer.class}
 )
 public class TextDDMFormFieldRenderer extends BaseDDMFormFieldRenderer {
 

diff --git a/...frame/iframe-web/src/com/liferay/iframe/web/portlet/action/IFrameConfigurationAction.java b/...frame/iframe-web/src/com/liferay/iframe/web/portlet/action/IFrameConfigurationAction.java
@@ -43,9 +43,7 @@
 @Component(
 	configurationPid = "com.liferay.iframe.web.configuration.IFrameConfiguration",
 	configurationPolicy = ConfigurationPolicy.OPTIONAL, immediate = true,
-	property = {
-		"javax.portlet.name=" + IFramePortletKeys.IFRAME
-	},
+	property = {"javax.portlet.name=" + IFramePortletKeys.IFRAME},
 	service = ConfigurationAction.class
 )
 public class IFrameConfigurationAction extends DefaultConfigurationAction {

diff --git a/...tion-web/src/com/liferay/invitation/web/portlet/action/InvitationConfigurationAction.java b/...tion-web/src/com/liferay/invitation/web/portlet/action/InvitationConfigurationAction.java
@@ -33,9 +33,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + InvitationPortletKeys.INVITATION
-	},
+	property = {"javax.portlet.name=" + InvitationPortletKeys.INVITATION},
 	service = ConfigurationAction.class
 )
 public class InvitationConfigurationAction extends DefaultConfigurationAction {

diff --git a/...ation/invitation-web/src/com/liferay/invitation/web/portlet/action/ViewActionCommand.java b/...ation/invitation-web/src/com/liferay/invitation/web/portlet/action/ViewActionCommand.java
@@ -139,19 +139,15 @@ else if (Validator.isNotNull(emailAddress)) {
 				"[$FROM_ADDRESS$]", "[$FROM_NAME$]", "[$PAGE_URL$]",
 				"[$PORTAL_URL$]"
 			},
-			new String[] {
-				fromAddress, fromName, layoutFullURL, portalURL
-			});
+			new String[] {fromAddress, fromName, layoutFullURL, portalURL});
 
 		body = StringUtil.replace(
 			body,
 			new String[] {
 				"[$FROM_ADDRESS$]", "[$FROM_NAME$]", "[$PAGE_URL$]",
 				"[$PORTAL_URL$]"
 			},
-			new String[] {
-				fromAddress, fromName, layoutFullURL, portalURL
-			});
+			new String[] {fromAddress, fromName, layoutFullURL, portalURL});
 
 		for (String emailAddress : validEmailAddresses) {
 			InternetAddress to = new InternetAddress(emailAddress);

diff --git a/...b/src/com/liferay/journal/web/customattributes/JournalArticleCustomAttributesDisplay.java b/...b/src/com/liferay/journal/web/customattributes/JournalArticleCustomAttributesDisplay.java
@@ -27,9 +27,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = CustomAttributesDisplay.class
 )
 public class JournalArticleCustomAttributesDisplay

diff --git a/...eb/src/com/liferay/journal/web/customattributes/JournalFolderCustomAttributesDisplay.java b/...eb/src/com/liferay/journal/web/customattributes/JournalFolderCustomAttributesDisplay.java
@@ -27,9 +27,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = CustomAttributesDisplay.class
 )
 public class JournalFolderCustomAttributesDisplay

diff --git a/modules/apps/journal/journal-web/src/com/liferay/journal/web/ddm/JournalDDMDisplay.java b/modules/apps/journal/journal-web/src/com/liferay/journal/web/ddm/JournalDDMDisplay.java
@@ -44,9 +44,7 @@
  * @author Eduardo Garcia
  */
 @Component(
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = DDMDisplay.class
 )
 public class JournalDDMDisplay extends BaseDDMDisplay {

diff --git a/...s/apps/journal/journal-web/src/com/liferay/journal/web/lar/JournalPortletDataHandler.java b/...s/apps/journal/journal-web/src/com/liferay/journal/web/lar/JournalPortletDataHandler.java
@@ -94,9 +94,7 @@
  * @see    com.liferay.portlet.journal.lar.JournalCreationStrategy
  */
 @Component(
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = PortletDataHandler.class
 )
 public class JournalPortletDataHandler extends BasePortletDataHandler {

diff --git a/...ournal/journal-web/src/com/liferay/journal/web/messaging/CheckArticleMessageListener.java b/...ournal/journal-web/src/com/liferay/journal/web/messaging/CheckArticleMessageListener.java
@@ -34,9 +34,7 @@
  * @author Tina Tian
  */
 @Component(
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = SchedulerEntry.class
 )
 public class CheckArticleMessageListener

diff --git a/...b/src/com/liferay/journal/web/notification/JournalAddEntryUserNotificationDefinition.java b/...b/src/com/liferay/journal/web/notification/JournalAddEntryUserNotificationDefinition.java
@@ -26,9 +26,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = UserNotificationDefinition.class
 )
 public class JournalAddEntryUserNotificationDefinition

diff --git a/...rc/com/liferay/journal/web/notification/JournalUpdateEntryUserNotificationDefinition.java b/...rc/com/liferay/journal/web/notification/JournalUpdateEntryUserNotificationDefinition.java
@@ -26,9 +26,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = UserNotificationDefinition.class
 )
 public class JournalUpdateEntryUserNotificationDefinition

diff --git a/.../journal-web/src/com/liferay/journal/web/notification/JournalUserNotificationHandler.java b/.../journal-web/src/com/liferay/journal/web/notification/JournalUserNotificationHandler.java
@@ -25,9 +25,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = UserNotificationHandler.class
 )
 public class JournalUserNotificationHandler

diff --git a/...al/journal-web/src/com/liferay/journal/web/portlet/action/JournalConfigurationAction.java b/...al/journal-web/src/com/liferay/journal/web/portlet/action/JournalConfigurationAction.java
@@ -35,9 +35,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = ConfigurationAction.class
 )
 public class JournalConfigurationAction extends DefaultConfigurationAction {

diff --git a/...rnal/journal-web/src/com/liferay/journal/web/portlet/template/JournalTemplateHandler.java b/...rnal/journal-web/src/com/liferay/journal/web/portlet/template/JournalTemplateHandler.java
@@ -44,9 +44,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = TemplateHandler.class
 )
 public class JournalTemplateHandler extends BaseDDMTemplateHandler {

diff --git a/modules/apps/journal/journal-web/src/com/liferay/journal/web/util/JournalRSSUtil.java b/modules/apps/journal/journal-web/src/com/liferay/journal/web/util/JournalRSSUtil.java
@@ -641,10 +641,7 @@ protected static String processURL(
 		SyndEntry syndEntry) {
 
 		url = StringUtil.replace(
-			url,
-			new String[] {
-				"@group_id@", "@image_path@", "@main_path@"
-			},
+			url, new String[] {"@group_id@", "@image_path@", "@main_path@"},
 			new String[] {
 				String.valueOf(feed.getGroupId()), themeDisplay.getPathImage(),
 				themeDisplay.getPathMain()

diff --git a/...apps/journal/journal-web/src/com/liferay/journal/web/webdav/JournalWebDAVStorageImpl.java b/...apps/journal/journal-web/src/com/liferay/journal/web/webdav/JournalWebDAVStorageImpl.java
@@ -41,9 +41,7 @@
  */
 @Component(
 	immediate = true,
-	property = {
-		"javax.portlet.name=" + JournalPortletKeys.JOURNAL
-	},
+	property = {"javax.portlet.name=" + JournalPortletKeys.JOURNAL},
 	service = WebDAVStorage.class
 )
 public class JournalWebDAVStorageImpl extends BaseWebDAVStorageImpl {

diff --git a/modules/apps/rss/rss-web/src/com/liferay/rss/web/portlet/action/RSSConfigurationAction.java b/modules/apps/rss/rss-web/src/com/liferay/rss/web/portlet/action/RSSConfigurationAction.java
@@ -46,10 +46,7 @@
  * @author Brian Wing Shun Chan
  */
 @Component(
-	immediate = true,
-	property = {
-		"javax.portlet.name=" + RSSPortletKeys.RSS
-	},
+	immediate = true, property = {"javax.portlet.name=" + RSSPortletKeys.RSS},
 	service = ConfigurationAction.class
 )
 public class RSSConfigurationAction extends DefaultConfigurationAction {

diff --git a/...ss/rss-web/src/com/liferay/rss/web/portlet/template/RSSPortletDisplayTemplateHandler.java b/...ss/rss-web/src/com/liferay/rss/web/portlet/template/RSSPortletDisplayTemplateHandler.java
@@ -36,10 +36,7 @@
  * @author Eudaldo Alonso
  */
 @Component(
-	immediate = true,
-	property = {
-		"javax.portlet.name=" + RSSPortletKeys.RSS
-	},
+	immediate = true, property = {"javax.portlet.name=" + RSSPortletKeys.RSS},
 	service = TemplateHandler.class
 )
 public class RSSPortletDisplayTemplateHandler

diff --git a/...s/apps/rss/rss-web/src/com/liferay/rss/web/portlet/validator/RSSPreferencesValidator.java b/...s/apps/rss/rss-web/src/com/liferay/rss/web/portlet/validator/RSSPreferencesValidator.java
@@ -30,10 +30,7 @@
  * @author Brian Wing Shun Chan
  */
 @Component(
-	immediate = true,
-	property = {
-		"javax.portlet.name=" + RSSPortletKeys.RSS
-	}
+	immediate = true, property = {"javax.portlet.name=" + RSSPortletKeys.RSS}
 )
 public class RSSPreferencesValidator implements PreferencesValidator {