Source formatting - sort private variables

GergoMathe · Jan 18, 2012 · d102da6 · d102da6
1 parent 6f780cc
commit d102da6
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 62 deletions.
diff --git a/portal-impl/src/com/liferay/portal/security/permission/BasePermissionChecker.java b/portal-impl/src/com/liferay/portal/security/permission/BasePermissionChecker.java
@@ -155,12 +155,12 @@ public void setCheckGuest(boolean checkGuest) {
 	public void setValues(PortletRequest portletRequest) {
 	}
 
-	protected User user;
-	protected long defaultUserId;
-	protected boolean signedIn;
 	protected boolean checkGuest;
+	protected long defaultUserId;
 	protected Boolean omniadmin;
 	protected Role ownerRole;
+	protected boolean signedIn;
+	protected User user;
 
 	private static Log _log = LogFactoryUtil.getLog(
 		BasePermissionChecker.class);

diff --git a/portal-impl/src/com/liferay/portlet/StrutsPortlet.java b/portal-impl/src/com/liferay/portlet/StrutsPortlet.java
@@ -254,14 +254,14 @@ protected void include(
 
 	protected String aboutAction;
 	protected String configAction;
+	protected boolean copyRequestParameters;
 	protected String editAction;
 	protected String editDefaultsAction;
 	protected String editGuestAction;
 	protected String helpAction;
 	protected String previewAction;
 	protected String printAction;
 	protected String viewAction;
-	protected boolean copyRequestParameters;
 
 	private PortletRequestProcessor _getPortletRequestProcessor(
 		PortletRequest portletRequest) {

diff --git a/portal-impl/src/com/liferay/portlet/wiki/translators/BaseTranslator.java b/portal-impl/src/com/liferay/portlet/wiki/translators/BaseTranslator.java
@@ -114,8 +114,8 @@ protected String unprotectNowikiText(String content) {
 		return content;
 	}
 
-	protected Map<String, String> regexps = new LinkedHashMap<String, String>();
 	protected List<String> nowikiRegexps = new LinkedList<String>();
+	protected Map<String, String> regexps = new LinkedHashMap<String, String>();
 
 	private String _normalizeLineBreaks(String content) {
 		content = StringUtil.replace(

diff --git a/portal-service/src/com/liferay/portal/kernel/cal/Recurrence.java b/portal-service/src/com/liferay/portal/kernel/cal/Recurrence.java
@@ -1071,58 +1071,58 @@ protected String stringizeIntArray(int[] a) {
 	}
 
 	/**
-	 * Field dtStart
+	 * Field byDay
 	 */
-	protected Calendar dtStart;
+	protected DayAndPosition[] byDay;
 
 	/**
-	 * Field duration
+	 * Field byMonth
 	 */
-	protected Duration duration;
+	protected int[] byMonth;
 
 	/**
-	 * Field frequency
+	 * Field byMonthDay
 	 */
-	protected int frequency;
+	protected int[] byMonthDay;
 
 	/**
-	 * Field interval
+	 * Field byWeekNo
 	 */
-	protected int interval;
+	protected int[] byWeekNo;
 
 	/**
-	 * Field interval
+	 * Field byYearDay
 	 */
-	protected int occurrence = 0;
+	protected int[] byYearDay;
 
 	/**
-	 * Field until
+	 * Field dtStart
 	 */
-	protected Calendar until;
+	protected Calendar dtStart;
 
 	/**
-	 * Field byDay
+	 * Field duration
 	 */
-	protected DayAndPosition[] byDay;
+	protected Duration duration;
 
 	/**
-	 * Field byMonthDay
+	 * Field frequency
 	 */
-	protected int[] byMonthDay;
+	protected int frequency;
 
 	/**
-	 * Field byYearDay
+	 * Field interval
 	 */
-	protected int[] byYearDay;
+	protected int interval;
 
 	/**
-	 * Field byWeekNo
+	 * Field interval
 	 */
-	protected int[] byWeekNo;
+	protected int occurrence = 0;
 
 	/**
-	 * Field byMonth
+	 * Field until
 	 */
-	protected int[] byMonth;
+	protected Calendar until;
 
 }
diff --git a/portal-service/src/com/liferay/portal/kernel/io/unsync/UnsyncStringReader.java b/portal-service/src/com/liferay/portal/kernel/io/unsync/UnsyncStringReader.java
@@ -147,8 +147,8 @@ public long skip(long skip) {
 	}
 
 	protected int index;
-	protected int stringLength;
 	protected int markIndex;
 	protected String string;
+	protected int stringLength;
 
 }
diff --git a/portal-service/src/com/liferay/portal/util/SubscriptionSender.java b/portal-service/src/com/liferay/portal/util/SubscriptionSender.java
@@ -641,8 +641,8 @@ protected void sendEmail(InternetAddress to, Locale locale)
 	protected String mailId;
 	protected String portletId;
 	protected String replyToAddress;
-	protected ServiceContext serviceContext;
 	protected long scopeGroupId;
+	protected ServiceContext serviceContext;
 	protected SMTPAccount smtpAccount;
 	protected String subject;
 	protected long userId;

diff --git a/portal-service/src/com/liferay/util/cal/Recurrence.java b/portal-service/src/com/liferay/util/cal/Recurrence.java
@@ -1072,58 +1072,58 @@ protected String stringizeIntArray(int[] a) {
 	}
 
 	/**
-	 * Field dtStart
+	 * Field byDay
 	 */
-	protected Calendar dtStart;
+	protected DayAndPosition[] byDay;
 
 	/**
-	 * Field duration
+	 * Field byMonth
 	 */
-	protected Duration duration;
+	protected int[] byMonth;
 
 	/**
-	 * Field frequency
+	 * Field byMonthDay
 	 */
-	protected int frequency;
+	protected int[] byMonthDay;
 
 	/**
-	 * Field interval
+	 * Field byWeekNo
 	 */
-	protected int interval;
+	protected int[] byWeekNo;
 
 	/**
-	 * Field interval
+	 * Field byYearDay
 	 */
-	protected int occurrence = 0;
+	protected int[] byYearDay;
 
 	/**
-	 * Field until
+	 * Field dtStart
 	 */
-	protected Calendar until;
+	protected Calendar dtStart;
 
 	/**
-	 * Field byDay
+	 * Field duration
 	 */
-	protected DayAndPosition[] byDay;
+	protected Duration duration;
 
 	/**
-	 * Field byMonthDay
+	 * Field frequency
 	 */
-	protected int[] byMonthDay;
+	protected int frequency;
 
 	/**
-	 * Field byYearDay
+	 * Field interval
 	 */
-	protected int[] byYearDay;
+	protected int interval;
 
 	/**
-	 * Field byWeekNo
+	 * Field interval
 	 */
-	protected int[] byWeekNo;
+	protected int occurrence = 0;
 
 	/**
-	 * Field byMonth
+	 * Field until
 	 */
-	protected int[] byMonth;
+	protected Calendar until;
 
 }
diff --git a/util-bridges/src/com/liferay/util/bridges/alloy/BaseAlloyControllerImpl.java b/util-bridges/src/com/liferay/util/bridges/alloy/BaseAlloyControllerImpl.java
@@ -521,8 +521,8 @@ else if (mimeResponse != null) {
 	protected ServletConfig servletConfig;
 	protected ServletContext servletContext;
 	protected ThemeDisplay themeDisplay;
-	protected String viewPath;
 	protected User user;
+	protected String viewPath;
 
 	private static final String _VIEW_PATH_ERROR = "VIEW_PATH_ERROR";
 

diff --git a/util-bridges/src/com/liferay/util/bridges/bsf/BaseBSFPortlet.java b/util-bridges/src/com/liferay/util/bridges/bsf/BaseBSFPortlet.java
@@ -255,13 +255,13 @@ protected void logBSFException(BSFException bsfe, String path) {
 		_log.error(message, t);
 	}
 
+	protected String actionFile;
+	protected BSFManager bsfManager;
 	protected String editFile;
+	protected String[] globalFiles;
 	protected String helpFile;
-	protected String viewFile;
-	protected String actionFile;
 	protected String resourceFile;
-	protected String[] globalFiles;
-	protected BSFManager bsfManager;
+	protected String viewFile;
 
 	private static Log _log = LogFactoryUtil.getLog(BaseBSFPortlet.class);
 

diff --git a/util-bridges/src/com/liferay/util/bridges/mvc/MVCPortlet.java b/util-bridges/src/com/liferay/util/bridges/mvc/MVCPortlet.java
@@ -401,9 +401,9 @@ protected void include(
 	protected String editGuestTemplate;
 	protected String editTemplate;
 	protected String helpTemplate;
-	protected String templatePath;
 	protected String previewTemplate;
 	protected String printTemplate;
+	protected String templatePath;
 	protected String viewTemplate;
 
 	private String _getInitParameter(String name) {

diff --git a/util-bridges/src/com/liferay/util/bridges/php/PHPPortlet.java b/util-bridges/src/com/liferay/util/bridges/php/PHPPortlet.java
@@ -220,12 +220,12 @@ protected String rewriteURLs(String page, PortletURL portletURL) {
 		return scriptPostProcess.getFinalizedPage();
 	}
 
+	protected boolean addPortletParams;
 	protected String editUri;
 	protected String helpUri;
-	protected String viewUri;
-	protected boolean addPortletParams;
-	protected ServletObjectsFactory servletObjectsFactory;
 	protected HttpServlet quercusServlet;
+	protected ServletObjectsFactory servletObjectsFactory;
+	protected String viewUri;
 
 	private static final String _PHP_URI_PARAM = "phpURI";
 

diff --git a/util-bridges/src/com/liferay/util/bridges/scripting/ScriptingPortlet.java b/util-bridges/src/com/liferay/util/bridges/scripting/ScriptingPortlet.java
@@ -295,11 +295,11 @@ protected void writeErrorMessage(
 
 	protected String actionFile;
 	protected String editFile;
-	protected String helpFile;
 	protected String[] globalFiles;
 	protected String globalScript;
-	protected String resourceFile;
+	protected String helpFile;
 	protected String language;
+	protected String resourceFile;
 	protected String viewFile;
 
 	private static final String _ERROR = ScriptingPortlet.class + ".ERROR";