Source formatting

GergoMathe · Feb 3, 2012 · 03cc207 · 03cc207
1 parent ee7de9c
commit 03cc207
Show file tree

Hide file tree

Showing 266 changed files with 21,102 additions and 21,654 deletions.
diff --git a/portal-impl/src/com/liferay/portal/bean/RendererImpl.java b/portal-impl/src/com/liferay/portal/bean/RendererImpl.java
diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheConfigurationUtil.java b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheConfigurationUtil.java
@@ -45,8 +45,7 @@ public static Configuration getConfiguration(
 	}
 
 	public static Configuration getConfiguration(
-		String configurationPath, boolean clusterAware,
-		boolean usingDefault) {
+		String configurationPath, boolean clusterAware, boolean usingDefault) {
 
 		if (Validator.isNull(configurationPath)) {
 			return null;

diff --git a/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java b/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java
@@ -962,12 +962,9 @@ protected String replaceTemplate(String template, String[] actual) {
 	};
 
 	protected static final String[] TEMPLATE = {
-		"##", "TRUE", "FALSE",
-		"'01/01/1970'", "CURRENT_TIMESTAMP",
-		" BLOB", " SBLOB", " BOOLEAN", " DATE",
-		" DOUBLE", " INTEGER", " LONG",
-		" STRING", " TEXT", " VARCHAR",
-		" IDENTITY", "COMMIT_TRANSACTION"
+		"##", "TRUE", "FALSE", "'01/01/1970'", "CURRENT_TIMESTAMP", " BLOB",
+		" SBLOB", " BOOLEAN", " DATE", " DOUBLE", " INTEGER", " LONG",
+		" STRING", " TEXT", " VARCHAR", " IDENTITY", "COMMIT_TRANSACTION"
 	};
 
 	private static final boolean _SUPPORTS_ALTER_COLUMN_NAME = true;

diff --git a/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java b/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java
@@ -215,11 +215,9 @@ private void _reorgTables(String[] templates) throws SQLException {
 	}
 
 	private static final String[] _DB2 = {
-		"--", "1", "0",
-		"'1970-01-01-00.00.00.000000'", "current timestamp",
-		" blob", " blob", " smallint", " timestamp",
-		" double", " integer", " bigint",
-		" varchar(500)", " clob", " varchar",
+		"--", "1", "0", "'1970-01-01-00.00.00.000000'", "current timestamp",
+		" blob", " blob", " smallint", " timestamp", " double", " integer",
+		" bigint", " varchar(500)", " clob", " varchar",
 		" generated always as identity", "commit"
 	};
 

diff --git a/portal-impl/src/com/liferay/portal/dao/db/DerbyDB.java b/portal-impl/src/com/liferay/portal/dao/db/DerbyDB.java
@@ -139,11 +139,9 @@ else if (line.indexOf(DROP_INDEX) != -1) {
 	}
 
 	private static final String[] _DERBY = {
-		"--", "1", "0",
-		"'1970-01-01-00.00.00.000000'", "current timestamp",
-		" blob", " blob", " smallint", " timestamp",
-		" double", " integer", " bigint",
-		" varchar(4000)", " clob", " varchar",
+		"--", "1", "0", "'1970-01-01-00.00.00.000000'", "current timestamp",
+		" blob", " blob", " smallint", " timestamp", " double", " integer",
+		" bigint", " varchar(4000)", " clob", " varchar",
 		" generated always as identity", "commit"
 	};
 

diff --git a/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java b/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java
@@ -130,12 +130,9 @@ else if (line.indexOf(DROP_INDEX) != -1) {
 	}
 
 	private static final String[] _FIREBIRD = {
-		"--", "1", "0",
-		"'01/01/1970'", "current_timestamp",
-		" blob", " blob", " smallint", " timestamp",
-		" double precision", " integer", " int64",
-		" varchar(4000)", " blob", " varchar",
-		"", "commit"
+		"--", "1", "0", "'01/01/1970'", "current_timestamp", " blob", " blob",
+		" smallint", " timestamp", " double precision", " integer", " int64",
+		" varchar(4000)", " blob", " varchar", "", "commit"
 	};
 
 	private static FirebirdDB _instance = new FirebirdDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java b/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java
@@ -108,12 +108,9 @@ else if (line.indexOf(DROP_INDEX) != -1) {
 	}
 
 	private static final String[] _HYPERSONIC = {
-		"//", "true", "false",
-		"'1970-01-01 00:00:00'", "now()",
-		" blob", " blob", " bit", " timestamp",
-		" double", " int", " bigint",
-		" longvarchar", " longvarchar", " varchar",
-		"", "commit"
+		"//", "true", "false", "'1970-01-01 00:00:00'", "now()", " blob",
+		" blob", " bit", " timestamp", " double", " int", " bigint",
+		" longvarchar", " longvarchar", " varchar", "", "commit"
 	};
 
 	private static HypersonicDB _instance = new HypersonicDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java b/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java
@@ -177,12 +177,9 @@ else if (line.indexOf("create table") >= 0) {
 	}
 
 	private static final String[] _INFORMIX_TEMPLATE = {
-		"--", "'T'", "'F'",
-		"'1970-01-01'", "CURRENT YEAR TO FRACTION",
-		" blob", " blob", " boolean", " datetime YEAR TO FRACTION",
-		" float", " int", " int8",
-		" lvarchar", " text", " varchar",
-		"", "commit"
+		"--", "'T'", "'F'", "'1970-01-01'", "CURRENT YEAR TO FRACTION", " blob",
+		" blob", " boolean", " datetime YEAR TO FRACTION", " float", " int",
+		" int8", " lvarchar", " text", " varchar", "", "commit"
 	};
 
 	private static InformixDB _instance = new InformixDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/IngresDB.java b/portal-impl/src/com/liferay/portal/dao/db/IngresDB.java
@@ -148,12 +148,9 @@ else if (line.indexOf(DROP_PRIMARY_KEY) != -1) {
 	}
 
 	private static final String[] _INGRES = {
-		"--", "1", "0",
-		"'1970-01-01'", "date('now')",
-		" blob", " blob", " tinyint", " timestamp",
-		" float", " integer", " bigint",
-		" varchar(1000)", " long varchar", " varchar",
-		"", "commit;\\g"
+		"--", "1", "0", "'1970-01-01'", "date('now')", " blob", " blob",
+		" tinyint", " timestamp", " float", " integer", " bigint",
+		" varchar(1000)", " long varchar", " varchar", "", "commit;\\g"
 	};
 
 	private static final boolean _SUPPORTS_ALTER_COLUMN_NAME = false;

diff --git a/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java b/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java
@@ -59,12 +59,9 @@ protected String[] getTemplate() {
 	}
 
 	private static final String[] _JDATASTORE = {
-		"--", "TRUE", "FALSE",
-		"'1970-01-01'", "current_timestamp",
-		" binary", " binary", " boolean", " date",
-		" double", " integer", " bigint",
-		" long varchar", " long varchar", " varchar",
-		"", "commit"
+		"--", "TRUE", "FALSE", "'1970-01-01'", "current_timestamp", " binary",
+		" binary", " boolean", " date", " double", " integer", " bigint",
+		" long varchar", " long varchar", " varchar", "", "commit"
 	};
 
 	private static JDataStoreDB _instance = new JDataStoreDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java b/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java
@@ -199,12 +199,9 @@ else if (line.startsWith(ALTER_COLUMN_TYPE)) {
 	}
 
 	private static final String[] _MYSQL = {
-		"##", "1", "0",
-		"'1970-01-01'", "now()",
-		" longblob", " longblob", " tinyint", " datetime",
-		" double", " integer", " bigint",
-		" longtext", " longtext", " varchar",
-		"  auto_increment", "commit"
+		"##", "1", "0", "'1970-01-01'", "now()", " longblob", " longblob",
+		" tinyint", " datetime", " double", " integer", " bigint", " longtext",
+		" longtext", " varchar", "  auto_increment", "commit"
 	};
 
 	private static final boolean _SUPPORTS_DATE_MILLISECONDS = false;

diff --git a/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java b/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java
@@ -318,9 +318,8 @@ private String _preBuildSQL(String template) throws IOException {
 		"--", "1", "0",
 		"to_date('1970-01-01 00:00:00','YYYY-MM-DD HH24:MI:SS')", "sysdate",
 		" blob", " blob", " number(1, 0)", " timestamp",
-		" number(30,20)", " number(30,0)", " number(30,0)",
-		" varchar2(4000)", " clob", " varchar2",
-		"", "commit"
+		" number(30,20)", " number(30,0)", " number(30,0)", " varchar2(4000)",
+		" clob", " varchar2", "", "commit"
 	};
 
 	private static final boolean _SUPPORTS_INLINE_DISTINCT = false;

diff --git a/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java b/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java
@@ -193,12 +193,9 @@ else if (line.indexOf("\\\'") != -1) {
 	}
 
 	private static final String[] _POSTGRESQL = {
-		"--", "true", "false",
-		"'01/01/1970'", "current_timestamp",
-		" oid", " bytea", " bool", " timestamp",
-		" double precision", " integer", " bigint",
-		" text", " text", " varchar",
-		"", "commit"
+		"--", "true", "false", "'01/01/1970'", "current_timestamp", " oid",
+		" bytea", " bool", " timestamp", " double precision", " integer",
+		" bigint", " text", " text", " varchar", "", "commit"
 	};
 
 	private static PostgreSQLDB _instance = new PostgreSQLDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java b/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java
@@ -99,12 +99,9 @@ else if (line.startsWith(ALTER_COLUMN_TYPE)) {
 	}
 
 	private static final String[] _SAP = {
-		"##", "TRUE", "FALSE",
-		"'1970-01-01 00:00:00.000000'", "timestamp",
-		" blob", " blob", " boolean", " timestamp",
-		" float", " int", " bigint",
-		" varchar", " varchar", " varchar",
-		"", "commit"
+		"##", "TRUE", "FALSE", "'1970-01-01 00:00:00.000000'", "timestamp",
+		" blob", " blob", " boolean", " timestamp", " float", " int", " bigint",
+		" varchar", " varchar", " varchar", "", "commit"
 	};
 
 	private static SAPDB _instance = new SAPDB();

diff --git a/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java b/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java
@@ -215,11 +215,9 @@ else if (line.indexOf(DROP_INDEX) != -1) {
 	}
 
 	private static final String[] _SQL_SERVER = {
-		"--", "1", "0",
-		"'19700101'", "GetDate()",
-		" image", " image", " bit", " datetime",
-		" float", " int", " bigint",
-		" nvarchar(2000)", " ntext", " nvarchar",
+		"--", "1", "0", "'19700101'", "GetDate()", " image", " image", " bit",
+		" datetime", " float", " int", " bigint", " nvarchar(2000)", " ntext",
+		" nvarchar",
 		"  identity(1,1)", "go"
 	};
 

diff --git a/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java b/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java
@@ -163,11 +163,9 @@ else if (line.indexOf(DROP_INDEX) != -1) {
 	private static final boolean _SUPPORTS_INLINE_DISTINCT = false;
 
 	private static final String[] _SYBASE = {
-		"--", "1", "0",
-		"'19700101'", "getdate()",
-		" image", " image", " int", " datetime",
-		" float", " int", " decimal(20,0)",
-		" varchar(1000)", " text", " varchar",
+		"--", "1", "0", "'19700101'", "getdate()", " image", " image", " int",
+		" datetime", " float", " int",
+		" decimal(20,0)", " varchar(1000)", " text", " varchar",
 		"  identity(1,1)", "go"
 	};
 

diff --git a/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java b/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java
@@ -184,8 +184,7 @@ public static void undeploy(String appServerType, File deployDir)
 		}
 
 		int undeployInterval = PrefsPropsUtil.getInteger(
-			PropsKeys.HOT_UNDEPLOY_INTERVAL,
-			PropsValues.HOT_UNDEPLOY_INTERVAL);
+			PropsKeys.HOT_UNDEPLOY_INTERVAL, PropsValues.HOT_UNDEPLOY_INTERVAL);
 
 		if (_log.isInfoEnabled()) {
 			_log.info(