[cvs] expresso commit by lhamel: cosmetic reformat
JCorporate Ltd
jcorp at jcorp2.servlets.net
Wed Nov 17 18:04:03 PST 2004
Log Message:
-----------
cosmetic reformat
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
Block.java
Controller.java
ControllerResponse.java
DBController.java
DefaultForm.java
ErrorCollection.java
ExpressoActionServlet.java
ExpressoPlugin.java
Input.java
State.java
Transition.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects:
BaseDataObject.java
DefaultDataField.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc:
JDBCDataObject.java
JDBCExecutor.java
JDBCUtil.java
JoinedDataObjectMetaData.java
JoinedDigesterBean.java
LobField.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db:
DBConnection.java
DBInitializer.java
DBTransaction.java
TableCreator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
AuditedSecuredDBObject.java
DBObject.java
DBObjectDef.java
DBSequence.java
ISOValidValue.java
MultiDBObject.java
RowSecuredDBObject.java
Schema.java
SecuredDBObject.java
ValidValue.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n:
MessageBundle.java
Messages.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job:
Job.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging:
LogHandler.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
Base64.java
ByteArrayDataSource.java
ConfigManager.java
CookieBase64.java
DateTime.java
EMailSender.java
EventHandler.java
EventQueueEntry.java
FileUtil.java
HTMLUtil.java
InetOutputStream.java
JavascriptUtil.java
StringUtil.java
XmlDocTypeFilter.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload:
BaseValueParser.java
MultipartStream.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security:
StringHash.java
User.java
UserInfo.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters:
AllowedHtmlPlusURLFilter.java
HtmlPlusURLFilter.java
ISO_8859_1.java
XmlFilter.java
gb2312.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption:
StringEncryption.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
DBTool.java
SystemInfo.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
ServeTextFile.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj:
ISOCountryCodes.java
RegisteredUser.java
RestrictedCountries.java
SingleDBUserInfo.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/regobj:
Address.java
Contact.java
Person.java
Phone.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/ldap:
UserLDAP.java
UserLDAPTest.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/regexp:
RE.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report:
DocBookFilterReader.java
DocBookFilterWriter.java
DocBookPrinter.java
XMLPrinter.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/html:
ExRadioTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/struts/taglib/logic:
ExIterateTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/taglib:
ElementCollection.java
ExConfigTag.java
ExpressoLink.java
TransitionParamsTag.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/velocity:
ExpressoTool.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/dbobj:
ControllerXSLMap.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel:
LogManager.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/digester:
ComponentConfig.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/exception:
ChainedException.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/kernel/util:
FastStringBuffer.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
EditUserPreference.java
ErrorHandler.java
SimpleRegistration.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
Lookup.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
ChangeLog.java
DefaultUserInfo.java
Event.java
EventMail.java
GroupMembers.java
JobHandlerControl.java
JobSecurity.java
LogEntry.java
RowGroupPerms.java
RowPermissions.java
Setup.java
UserGroup.java
UserPreferenceDef.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/html:
Text.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation:
ChangePasswordValidator.java
Revision Data
-------------
Index: UserPreferenceDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserPreferenceDef.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserPreferenceDef.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserPreferenceDef.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserPreferenceDef.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserPreferenceDef.java
@@ -151,9 +151,7 @@
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public synchronized void populateDefaultValues()
throws DBException {
Index: JobSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java
@@ -119,9 +119,7 @@
}
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public void add()
throws DBException {
Index: Setup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java
@@ -358,7 +358,9 @@
try {
setupValue = getValue(dbName, setupCode);
// getvalue can return "" for some error cases
- if ("".equals(setupValue)) setupValue = null;
+ if ("".equals(setupValue)) {
+ setupValue = null;
+ }
} catch (DBException e) {
// no problem
}
@@ -380,7 +382,9 @@
try {
setupValue = getValue(dbName, schema, setupCode);
// getvalue can return "" for some error cases
- if ("".equals(setupValue)) setupValue = null;
+ if ("".equals(setupValue)) {
+ setupValue = null;
+ }
} catch (DBException e) {
// no problem
}
Index: RowGroupPerms.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowGroupPerms.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowGroupPerms.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowGroupPerms.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowGroupPerms.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowGroupPerms.java
@@ -116,8 +116,12 @@
*/
public RowGroupPerms(String table, String rowKey) throws DBException {
// test for key length being too large
- if (rowKey == null) throw new DBException("null row key");
- if (table == null) throw new DBException("null table name");
+ if (rowKey == null) {
+ throw new DBException("null row key");
+ }
+ if (table == null) {
+ throw new DBException("null table name");
+ }
if ((rowKey.length() + table.length()) > RowPermissions.sMaxKeyLen) {
throw new DBException("Cannot create row permissions for table: "
@@ -202,7 +206,9 @@
* @throws DBException upon error
*/
public void group(String group) throws DBException {
- if (group == null) throw new DBException("null group name");
+ if (group == null) {
+ throw new DBException("null group name");
+ }
String tablename = getField(TABLE_NAME);
String rowKey = getField(ROW_KEY);
@@ -245,7 +251,9 @@
*/
public int permissions() throws DBException {
// protect against empty perm.
- if (getField(PERMISSIONS).length() == 0) return 0;
+ if (getField(PERMISSIONS).length() == 0) {
+ return 0;
+ }
return getFieldInt(PERMISSIONS);
}
Index: LogEntry.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/LogEntry.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/LogEntry.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/LogEntry.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/LogEntry.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/LogEntry.java
@@ -146,9 +146,7 @@
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public void setTimeStamp()
throws DBException {
Index: GroupMembers.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java -u -r1.25 -r1.26
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java
@@ -153,7 +153,9 @@
* @param localConnection the DB connection which should be used, typically because of an ongoing transaction
*/
public GroupMembers(DBConnection localConnection) throws DBException {
- if (localConnection != null) setConnection(localConnection);
+ if (localConnection != null) {
+ setConnection(localConnection);
+ }
}
/**
Index: JobHandlerControl.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobHandlerControl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobHandlerControl.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobHandlerControl.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobHandlerControl.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobHandlerControl.java
@@ -99,7 +99,7 @@
public static final String STOP_COMMAND = "stop";
/**
- * @throws DBException
+ * @throws DBException
*/
public JobHandlerControl()
throws DBException {
@@ -128,8 +128,7 @@
}
/**
- *
- * @throws DBException
+ * @throws DBException
*/
protected synchronized void setupFields()
throws DBException {
Index: UserGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java -u -r1.23 -r1.24
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java
@@ -140,7 +140,9 @@
* @param localConnection the connection which should be used, typically because of an ongoing transaction
*/
public UserGroup(DBConnection localConnection) throws DBException {
- if (localConnection != null) setConnection(localConnection);
+ if (localConnection != null) {
+ setConnection(localConnection);
+ }
}
/**
Index: Event.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Event.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Event.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Event.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Event.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Event.java
@@ -311,9 +311,7 @@
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public synchronized void populateDefaultValues()
throws DBException {
Index: RowPermissions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowPermissions.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowPermissions.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowPermissions.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowPermissions.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/RowPermissions.java
@@ -202,8 +202,12 @@
public RowPermissions(String table, String rowKey)
throws DBException {
- if (rowKey == null) throw new DBException("null row key");
- if (table == null) throw new DBException("null table name");
+ if (rowKey == null) {
+ throw new DBException("null row key");
+ }
+ if (table == null) {
+ throw new DBException("null table name");
+ }
// test for key length being too large
if ((rowKey.length() + table.length()) > getMaxKeyLen()) {
@@ -293,7 +297,9 @@
*/
public int permissions() throws DBException {
// protect against empty perm.
- if (getField(PERMISSIONS).length() == 0) return 0;
+ if (getField(PERMISSIONS).length() == 0) {
+ return 0;
+ }
return getFieldInt(PERMISSIONS);
}
Index: DefaultUserInfo.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -u -r1.47 -r1.48
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
@@ -259,7 +259,9 @@
* @param localConnection the DB connection which should be used, typically because of an ongoing transaction
*/
public DefaultUserInfo(DBConnection localConnection) throws DBException {
- if (localConnection != null) setConnection(localConnection);
+ if (localConnection != null) {
+ setConnection(localConnection);
+ }
}
/**
Index: ChangeLog.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/ChangeLog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/ChangeLog.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/ChangeLog.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/ChangeLog.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/ChangeLog.java
@@ -93,9 +93,7 @@
} /* ChangeLog() */
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public synchronized void add()
throws DBException {
@@ -114,9 +112,7 @@
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
protected synchronized void setupFields()
throws DBException {
Index: EventMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/EventMail.java
@@ -204,9 +204,7 @@
}
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public synchronized void populateDefaultValues()
throws DBException {
Index: ExpressoActionServlet.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoActionServlet.java
@@ -449,8 +449,9 @@
synchronized (mapModuleConfig) {
config = (ModuleConfig) mapModuleConfig.get(moduleName);
}
- if (config == null)
+ if (config == null) {
throw new ControllerException("unable to find specified Struts module 1.1 prefix:`" + moduleName + "'");
+ }
ExpressoRequestProcessor processor = null;
try {
Index: DefaultForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
@@ -250,8 +250,9 @@
if (request instanceof ServletControllerRequest) {
ServletControllerRequest scr = (ServletControllerRequest) request;
return (ErrorCollection) this.validate(scr.getMapping(), (HttpServletRequest) scr.getServletRequest());
- } else
+ } else {
return new ErrorCollection();
+ }
}
Index: State.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/State.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/State.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/State.java -u -r1.29 -r1.30
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/State.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/State.java
@@ -500,10 +500,11 @@
* @param mask The regular expression mask to compare against.
*/
public void addParameter(String newParam, boolean required, String mask) {
- if (required)
+ if (required) {
addRequiredParameter(newParam);
- else
+ } else {
addOptionalParameter(newParam);
+ }
setMask(newParam, mask);
}
@@ -518,10 +519,11 @@
*/
public void addParameter(String newParam, boolean required, String mask,
String maskError) {
- if (required)
+ if (required) {
addRequiredParameter(newParam);
- else
+ } else {
addOptionalParameter(newParam);
+ }
setMask(newParam, mask);
setMaskError(newParam, maskError);
}
Index: ErrorCollection.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ErrorCollection.java
@@ -99,8 +99,9 @@
* @param errorMessage com.jcorporate.expresso.core.controller.Output
*/
public void addError(String errorMessage) {
- if (!hasErrorMessage(errorMessage))
+ if (!hasErrorMessage(errorMessage)) {
add(ActionErrors.GLOBAL_ERROR, new ActionError(errorMessage));
+ }
} /* addError(String) */
/**
@@ -111,8 +112,9 @@
* @param errorMessageParam1 java.lang.String
*/
public void addError(String errorMessage, Object errorMessageParam1) {
- if (!hasErrorMessage(errorMessage))
+ if (!hasErrorMessage(errorMessage)) {
add(ActionErrors.GLOBAL_ERROR, new ActionError(errorMessage, errorMessageParam1));
+ }
} /* addError(String) */
@@ -125,8 +127,9 @@
* @param errorMessageParam2 java.lang.String
*/
public void addError(String errorMessage, Object errorMessageParam1, Object errorMessageParam2) {
- if (!hasErrorMessage(errorMessage))
+ if (!hasErrorMessage(errorMessage)) {
add(ActionErrors.GLOBAL_ERROR, new ActionError(errorMessage, errorMessageParam1, errorMessageParam2));
+ }
} /* addError(String) */
@@ -143,9 +146,10 @@
Object errorMessageParam1,
Object errorMessageParam2,
Object errorMessageParam3) {
- if (!hasErrorMessage(errorMessage))
+ if (!hasErrorMessage(errorMessage)) {
add(ActionErrors.GLOBAL_ERROR,
new ActionError(errorMessage, errorMessageParam1, errorMessageParam2, errorMessageParam3));
+ }
} /* addError(String) */
/**
@@ -154,8 +158,9 @@
* @param errorMessage java.lang.String
*/
public void addError(String errorMessage, Object[] args) {
- if (!hasErrorMessage(errorMessage))
+ if (!hasErrorMessage(errorMessage)) {
add(ActionErrors.GLOBAL_ERROR, new ActionError(errorMessage, args));
+ }
} /* addError(String) */
Index: ControllerResponse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java -u -r1.53 -r1.54
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ControllerResponse.java
@@ -2236,16 +2236,24 @@
HashMap mappedNested = new HashMap();
Map map = this.getNamedBlocks();
- if (map != null) mappedNested.putAll(map);
+ if (map != null) {
+ mappedNested.putAll(map);
+ }
map = this.getNamedInputs();
- if (map != null) mappedNested.putAll(map);
+ if (map != null) {
+ mappedNested.putAll(map);
+ }
map = this.getNamedOutputs();
- if (map != null) mappedNested.putAll(map);
+ if (map != null) {
+ mappedNested.putAll(map);
+ }
map = this.getNamedTransitions();
- if (map != null) mappedNested.putAll(map);
+ if (map != null) {
+ mappedNested.putAll(map);
+ }
return mappedNested;
}
Index: Input.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java -u -r1.31 -r1.32
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Input.java
@@ -283,11 +283,15 @@
synchronized (this) { // this sync means nothing since setter methods are not sync'd, but inputs are generally not handled by more than one thread at a time
i = (Input) super.clone();
- if (defaultValue != null) i.defaultValue = (ArrayList) defaultValue.clone();
+ if (defaultValue != null) {
+ i.defaultValue = (ArrayList) defaultValue.clone();
+ }
i.maxLength = maxLength;
i.lookup = (lookup);
i.key = key;
- if (validValues != null) i.validValues = (Vector) validValues.clone();
+ if (validValues != null) {
+ i.validValues = (Vector) validValues.clone();
+ }
if (getAttributes().size() > 0) {
i.getAttributes().putAll(getAttributes());
}
@@ -540,7 +544,9 @@
* * buttons, etc). Can be empty, but Never null.
*/
public Vector getValidValues() {
- if (validValues == null) return new Vector();
+ if (validValues == null) {
+ return new Vector();
+ }
return validValues;
}
@@ -554,12 +560,16 @@
public void setDefaultValue(String newValue) {
if (newValue == null) {
// is this trying to unset a value?
- if (defaultValue != null) defaultValue.clear();
+ if (defaultValue != null) {
+ defaultValue.clear();
+ }
return;
}
- if (defaultValue == null) defaultValue = new ArrayList();
+ if (defaultValue == null) {
+ defaultValue = new ArrayList();
+ }
if (defaultValue.size() == 0) {
defaultValue.add(newValue);
@@ -578,7 +588,9 @@
public void setDefaultValue(List list) {
if (list == null) {
// is this trying to unset a value?
- if (defaultValue != null) defaultValue.clear();
+ if (defaultValue != null) {
+ defaultValue.clear();
+ }
return;
}
@@ -603,7 +615,9 @@
return; // could throw, but seems nicer to just discard
}
- if (defaultValue == null) defaultValue = new ArrayList();
+ if (defaultValue == null) {
+ defaultValue = new ArrayList();
+ }
defaultValue.add(newValue);
}
@@ -755,7 +769,9 @@
}
}
- if (result == null) result = "";
+ if (result == null) {
+ result = "";
+ }
return result;
}
} /* Input */
Index: Block.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Block.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Block.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Block.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Block.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Block.java
@@ -131,16 +131,24 @@
// iterate through the 4 possibilites in order to
// fill the right map
if (element instanceof Output) {
- if (mNestedOutputs == null) mNestedOutputs = new HashMap();
+ if (mNestedOutputs == null) {
+ mNestedOutputs = new HashMap();
+ }
mNestedOutputs.put(element.getName(), element);
} else if (element instanceof Input) {
- if (mNestedInputs == null) mNestedInputs = new HashMap();
+ if (mNestedInputs == null) {
+ mNestedInputs = new HashMap();
+ }
mNestedInputs.put(element.getName(), element);
} else if (element instanceof Transition) {
- if (mNestedTransitions == null) mNestedTransitions = new HashMap();
+ if (mNestedTransitions == null) {
+ mNestedTransitions = new HashMap();
+ }
mNestedTransitions.put(element.getName(), element);
} else if (element instanceof Block) {
- if (mNestedBlocks == null) mNestedBlocks = new HashMap();
+ if (mNestedBlocks == null) {
+ mNestedBlocks = new HashMap();
+ }
mNestedBlocks.put(element.getName(), element);
}
}
@@ -197,14 +205,15 @@
throws ControllerException {
super.removeNested(elementToRemove);
- if (elementToRemove instanceof Input)
+ if (elementToRemove instanceof Input) {
mNestedInputs.remove(elementToRemove.getName());
- else if (elementToRemove instanceof Output)
+ } else if (elementToRemove instanceof Output) {
mNestedOutputs.remove(elementToRemove.getName());
- else if (elementToRemove instanceof Transition)
+ } else if (elementToRemove instanceof Transition) {
mNestedTransitions.remove(elementToRemove.getName());
- else if (elementToRemove instanceof Block)
+ } else if (elementToRemove instanceof Block) {
mNestedBlocks.remove(elementToRemove.getName());
+ }
} /* removeNested(ControllerElement) */
/**
Index: Transition.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java -u -r1.60 -r1.61
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Transition.java
@@ -490,10 +490,11 @@
}
- if (includeControllerParameter)
+ if (includeControllerParameter) {
return cacheParamStringWithController;
- else
+ } else {
return cacheParamStringSansController;
+ }
}
Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -u -r1.103 -r1.104
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
@@ -2327,8 +2327,9 @@
String ext = path.substring(lastDot);
if (ext.equalsIgnoreCase(".xsl") || ext.equalsIgnoreCase(".xslt")) {
fwd = mapping.getModuleConfig().findForwardConfig("xml");
- if (fwd == null)
+ if (fwd == null) {
log.warn("cannot find action forward 'xml' which must be defined when using XSL forwards");
+ }
req.setParameter("xsl", path);
}
}
@@ -3157,8 +3158,9 @@
if (request instanceof ServletControllerRequest) {
ServletControllerRequest scr = (ServletControllerRequest) request;
return super.generateToken((HttpServletRequest) scr.getServletRequest());
- } else
+ } else {
return "no-web-environment.transaction.token";
+ }
}
Index: DBController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java -u -r1.34 -r1.35
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DBController.java
@@ -295,7 +295,9 @@
CacheException {
boolean allowed = false;
- if (controller == null) return false;
+ if (controller == null) {
+ return false;
+ }
//Grab the user
User thisUser = new User();
@@ -304,7 +306,9 @@
thisUser.retrieve();
// admin is always allowed
- if (thisUser.isAdmin()) return true;
+ if (thisUser.isAdmin()) {
+ return true;
+ }
String controllerClassName = controller.getClass().getName();
//This gets filled with any group names that weren't in the cache
Index: ExpressoPlugin.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoPlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoPlugin.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoPlugin.java -u -r1.3 -r1.4
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoPlugin.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ExpressoPlugin.java
@@ -84,14 +84,14 @@
* Company: Jcorporate
*
* @author Peter Pilgrim Wed Feb 12 19:39:44 GMT 2003
- * <p/>
- * A Plug-in to set up the Struts support for Expresso Framework.
- * This plugin conveniently extends the Tiles plug-in so that
- * Tiles definition can be used from the get-go.
- * <p/>
- * <p/>
- * <font color="red">Design notes by Peter Pilgrim Wed Feb 12 19:35:28 GMT 2003</font>
- * </p>
+ * <p/>
+ * A Plug-in to set up the Struts support for Expresso Framework.
+ * This plugin conveniently extends the Tiles plug-in so that
+ * Tiles definition can be used from the get-go.
+ * <p/>
+ * <p/>
+ * <font color="red">Design notes by Peter Pilgrim Wed Feb 12 19:35:28 GMT 2003</font>
+ * </p>
*/
public class ExpressoPlugin extends TilesPlugin {
Index: BaseDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/BaseDataObject.java
@@ -181,7 +181,9 @@
if ((fieldValue == null) || (fieldValue.length() == 0)) {
fieldValue = metadata.getDefaultValue(fieldname);
- if (fieldValue != null) this.set(fieldname, fieldValue);
+ if (fieldValue != null) {
+ this.set(fieldname, fieldValue);
+ }
}
}
Index: DefaultDataField.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java -u -r1.35 -r1.36
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DefaultDataField.java
@@ -255,8 +255,12 @@
.getJdbc().isNativeBool();
if (!nativeBoolean) {
// fix up a true/false into what we expect to serialize
- if ("true".equalsIgnoreCase(result)) result = "Y";
- if ("false".equalsIgnoreCase(result)) result = "N";
+ if ("true".equalsIgnoreCase(result)) {
+ result = "Y";
+ }
+ if ("false".equalsIgnoreCase(result)) {
+ result = "N";
+ }
}
} catch (ConfigurationException ce) {
throw new DataException(ce);
Index: JoinedDataObjectMetaData.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObjectMetaData.java
@@ -90,8 +90,8 @@
* the JoinedDataObject.
*
* @author Michael Rimov
- * <p/>
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+ * <p/>
+ * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
* @since $DatabaseSchema $Date$
*/
public class JoinedDataObjectMetaData implements DataObjectMetaData {
@@ -277,9 +277,10 @@
continue;
}
int firstClosed = fieldExpression.indexOf(")");
- if (firstClosed == -1)
+ if (firstClosed == -1) {
throw new DataException(":Invalid expression for DBObject '" +
dataObjectClass.getName());
+ }
String fieldName = fieldExpression.substring(lastOpen + 1,
firstClosed);
Index: JDBCUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java -u -r1.32 -r1.33
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCUtil.java
@@ -577,8 +577,9 @@
criteria.getDataField(oneFieldName).checkValue();
criteria.getDataField(oneFieldName).setValue(origValue);
}
- } else
+ } else {
criteria.getDataField(oneFieldName).checkValue();
+ }
} catch (DBException ex) {
if (ex instanceof DataException) {
throw ((DataException) ex);
@@ -672,7 +673,9 @@
}
myStatement.append(".");
int precision = oneField.getPrecision();
- if (precision == 0) precision = 1;
+ if (precision == 0) {
+ precision = 1;
+ }
for (int i = 0; i < oneField.getPrecision() - 1; i++) {
myStatement.append("0");
}
@@ -1143,7 +1146,9 @@
}
myStatement.append(".");
int precision = oneField.getPrecision();
- if (precision == 0) precision = 1;
+ if (precision == 0) {
+ precision = 1;
+ }
for (int i = 0; i < oneField.getPrecision() - 1; i++) {
myStatement.append("0");
}
Index: JDBCExecutor.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java -u -r1.61 -r1.62
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCExecutor.java
@@ -769,7 +769,9 @@
for (Iterator i = metadata.getAllFieldsMap().values().iterator(); i.hasNext();) {
oneField = (DBField) i.next();
//We aren't retrieving long objects
- if (oneField.isBinaryObjectType()) continue;
+ if (oneField.isBinaryObjectType()) {
+ continue;
+ }
if (!oneField.isVirtual()) {
if (needComma) {
@@ -863,7 +865,9 @@
oneField = (DBField) it.next();
if (!oneField.isVirtual()) {
- if (oneField.isBinaryObjectType()) continue;
+ if (oneField.isBinaryObjectType()) {
+ continue;
+ }
try {
// * @author Yves Henri AMAIZO
@@ -1640,7 +1644,9 @@
oneField = (DBField) it.next();
fieldNum = Integer.parseInt(oneField.getName());
if (!oneField.isVirtual()) {
- if (oneField.isBinaryObjectType()) continue;
+ if (oneField.isBinaryObjectType()) {
+ continue;
+ }
try {
// * @author Yves Henri AMAIZO
// Handle correctly date from resultSet data retrieve from Database
@@ -1655,8 +1661,7 @@
}
}
} catch (DBException de1) {
- throw new DataException(
- "(" + getClass().getName() + ") Error retrieving field '" +
+ throw new DataException("(" + getClass().getName() + ") Error retrieving field '" +
oneField.getName() + "' index " + fieldNum + ":" + de1.getMessage(),
de1.getDBMessage());
}
Index: JoinedDigesterBean.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDigesterBean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDigesterBean.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDigesterBean.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDigesterBean.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDigesterBean.java
@@ -211,8 +211,9 @@
digester.addCallMethod("dataobject-join/distinct", "setDistinct", 1, new Class[]{java.lang.Boolean.class});
digester.addCallParam("dataobject-join/distinct", 0, "distinctJoin");
- digester.addCallMethod("dataobject-join/permissions", "setPermissions", 4, new Class[]{java.lang.Boolean.class,
- java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class});
+ digester.addCallMethod("dataobject-join/permissions", "setPermissions", 4,
+ new Class[]{java.lang.Boolean.class,
+ java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class});
digester.addCallParam("dataobject-join/permissions", 0, "add");
digester.addCallParam("dataobject-join/permissions", 1, "read");
digester.addCallParam("dataobject-join/permissions", 2, "update");
@@ -338,7 +339,7 @@
/**
* Bean representing all the dataobject information. Instances of
* this bean are retrieved by getDataObjects();
- *
+ * <p/>
* author Michael Rimov
*/
public class DigesterJoinedDataObject {
@@ -388,7 +389,7 @@
/**
* Bean representing all the joined relation information. Instances of
* this bean are retrieved by getRelations();
- *
+ * <p/>
* author Michael Rimov
*/
public class DigesterJoinRelations {
Index: LobField.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/LobField.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/LobField.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/LobField.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/LobField.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/LobField.java
@@ -1065,8 +1065,9 @@
int i = -1;
- while ((i = data.read(chunk)) != -1)
+ while ((i = data.read(chunk)) != -1) {
oBlob.write(chunk, 0, i);
+ }
oBlob.close();
data.close();
@@ -1153,8 +1154,9 @@
int i = -1;
- while ((i = data.read(chunk)) != -1)
+ while ((i = data.read(chunk)) != -1) {
oClob.write(chunk, 0, i);
+ }
oClob.close();
data.close();
@@ -1239,8 +1241,9 @@
int i = -1;
- while ((i = data.read(chunk)) != -1)
+ while ((i = data.read(chunk)) != -1) {
oClob.write(chunk, 0, i);
+ }
oClob.close();
data.close();
Index: JDBCDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -u -r1.41 -r1.42
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
@@ -346,8 +346,12 @@
getMappedDataContext()).getJdbc().isNativeBool();
if (!nativeBoolean) {
// fix up a true/false into what we expect to serialize
- if ("true".equalsIgnoreCase(result)) result = "Y";
- if ("false".equalsIgnoreCase(result)) result = "N";
+ if ("true".equalsIgnoreCase(result)) {
+ result = "Y";
+ }
+ if ("false".equalsIgnoreCase(result)) {
+ result = "N";
+ }
}
} catch (ConfigurationException ce) {
throw new DataException(ce);
Index: DBConnection.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java -u -r1.56 -r1.57
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBConnection.java
@@ -1064,7 +1064,9 @@
long endTimer = System.currentTimeMillis();
if (log.isDebugEnabled()) {
String pre = strSQL;
- if (preparedStatement != null) pre = " prepared statement";
+ if (preparedStatement != null) {
+ pre = " prepared statement";
+ }
String msg = "Time to execute" + pre + " was " +
(endTimer - getLastTouched()) +
" milliseconds";
@@ -1072,7 +1074,9 @@
}
if (sqlLog.isDebugEnabled()) {
String pre = "";
- if (preparedStatement != null) pre = " prepared statement";
+ if (preparedStatement != null) {
+ pre = " prepared statement";
+ }
String msg = "Time to execute" + pre + " was " +
(endTimer - getLastTouched()) +
" milliseconds";
Index: DBTransaction.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBTransaction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBTransaction.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBTransaction.java -u -r1.4 -r1.5
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBTransaction.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBTransaction.java
@@ -230,8 +230,9 @@
isConnected = true;
setId(myConnection.getId());
lastCommited = 0;
- } else
+ } else {
return;
+ }
}
lastCommited++;
if (transLog.isDebugEnabled()) {
@@ -240,8 +241,9 @@
}
} catch (DBException e) {
log.error(myName + "DBException : initialize transaction failed!", e);
- if (myConnection != null)
+ if (myConnection != null) {
close();
+ }
}
} /* transactionSetup(String) */
Index: DBInitializer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBInitializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBInitializer.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBInitializer.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBInitializer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/DBInitializer.java
@@ -154,8 +154,9 @@
myPool = DBConnectionPool.getInstance(dbName);
if (myPool != null) {
myConnection = myPool.getConnection("DBInitialize");
- } else
+ } else {
return null;
+ }
} catch (Exception de) {
System.out.println("DBInitialze Error:" + de.getMessage());
@@ -187,8 +188,9 @@
public static void setDbName(String newDBName) {
if (newDBName != null) {
dbName = newDBName;
- } else
+ } else {
dbName = "default";
+ }
}
} /* DBInitialze */
Index: TableCreator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java
@@ -90,8 +90,8 @@
* since it will be seldom used and when done should be discarded.
*
* @author Michael Rimov
- * <p/>
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+ * <p/>
+ * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
* @since $DatabaseSchema $Date$
*/
Index: Schema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java -u -r1.50 -r1.51
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/Schema.java
@@ -644,10 +644,11 @@
// behaviors of an application, so we have to make some assumptions here.
if (oneDBObject instanceof SecuredDBObject) {
- if (getRequestingUser() != 0)
+ if (getRequestingUser() != 0) {
((SecuredDBObject) oneDBObject).setRequestingUid(getRequestingUser());
- else
+ } else {
((SecuredDBObject) oneDBObject).setRequestingUid(SecuredDBObject.SYSTEM_ACCOUNT);
+ }
}
theDBObjects.addElement(oneDBObject);
Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java -u -r1.34 -r1.35
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java
@@ -553,7 +553,9 @@
user.setUid(userId);
user.setDataContext(this.getDataContext());
- if (user.isAdmin()) return true;
+ if (user.isAdmin()) {
+ return true;
+ }
if (!user.find()) {
throw new DBException("cannot find requesting user.");
@@ -599,7 +601,9 @@
user.setUid(userId);
user.setDataContext(this.getDataContext());
- if (user.isAdmin()) return true;
+ if (user.isAdmin()) {
+ return true;
+ }
if (!user.find()) {
throw new DBException("cannot find requesting user.");
@@ -647,7 +651,9 @@
user.setUid(userId);
user.setDataContext(this.getDataContext());
- if (user.isAdmin()) return true;
+ if (user.isAdmin()) {
+ return true;
+ }
if (!user.find()) {
throw new DBException("cannot find requesting user.");
Index: ISOValidValue.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ISOValidValue.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ISOValidValue.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ISOValidValue.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ISOValidValue.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ISOValidValue.java
@@ -259,8 +259,9 @@
try {
result = Messages.getString(schemaClass, locale, key, new Object[0]);
// System.out.println( "key:`"+key+"' => result:`"+result+"'" );
- if (result != null)
+ if (result != null) {
description = result;
+ }
} catch (IllegalArgumentException iae) {
// Silently ignore exception message "No such key
// 'com.jcorporate.eforum.search.LAST_DAY' in bundle at
@@ -299,8 +300,9 @@
try {
result = Messages.getString(schemaClass, request.getLocale(), key, new Object[0]);
// System.out.println( "key:`"+key+"' => result:`"+result+"'" );
- if (result != null)
+ if (result != null) {
description = result;
+ }
} catch (IllegalArgumentException iae) {
// Silently ignore exception message "No such key
// 'com.jcorporate.eforum.search.LAST_DAY' in bundle at
Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.228
retrieving revision 1.229
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -u -r1.228 -r1.229
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
@@ -957,7 +957,9 @@
*/
protected void setSortKey(String sortKeyString) {
if (sortKeyString == null) {
- if (sortKeys != null) sortKeys.clear();
+ if (sortKeys != null) {
+ sortKeys.clear();
+ }
return;
}
@@ -1112,8 +1114,12 @@
oneField = (DBField) i.next();
if (!oneField.isVirtual()) {
- if (isFieldNull(oneField.getName())) continue;
- if (oneField.isBinaryObjectType()) continue;
+ if (isFieldNull(oneField.getName())) {
+ continue;
+ }
+ if (oneField.isBinaryObjectType()) {
+ continue;
+ }
if (needComma) {
sqlCommand.append(", ");
}
@@ -1131,8 +1137,12 @@
oneField = (DBField) i.next();
if (!oneField.isVirtual()) {
- if (isFieldNull(oneField.getName())) continue;
- if (oneField.isBinaryObjectType()) continue;
+ if (isFieldNull(oneField.getName())) {
+ continue;
+ }
+ if (oneField.isBinaryObjectType()) {
+ continue;
+ }
String stringToAdd = null;
if (oneField.isDateType()) {
@@ -1483,7 +1493,9 @@
isCheck = StringUtil.toBoolean(isCheckRelationalIntegrity);
}
- if (!isCheck) return;
+ if (!isCheck) {
+ return;
+ }
refObject.setDataContext(getDataContext());
@@ -1781,7 +1793,9 @@
myConnection = getConnectionPool().getConnection(myClassName);
}
- if (myConnection == null) throw new DBException("null DB connection");
+ if (myConnection == null) {
+ throw new DBException("null DB connection");
+ }
if (deleteDetails) {
/**
@@ -1896,11 +1910,15 @@
// does local field have a value set?
DataField datafield = getDataField(fieldName);
// ignore this field if no setting
- if (!datafield.isValueSet()) continue;
+ if (!datafield.isValueSet()) {
+ continue;
+ }
Object valObj = datafield.getValue();
String valStr = null;
- if (valObj != null) valStr = valObj.toString();
+ if (valObj != null) {
+ valStr = valObj.toString();
+ }
if (valStr != null && valStr.length() > 0) {
// use 'raw' value in data field
testObject.setField(fieldName, datafield.getValue().toString());
@@ -2032,7 +2050,9 @@
myConnection = this.getConnectionPool().getConnection(this.myClassName);
}
- if (myConnection == null) throw new DBException("null DB connection");
+ if (myConnection == null) {
+ throw new DBException("null DB connection");
+ }
// this will commit details too if auto-commit is true;
// otherwise, it is up to the calling routine to commit
@@ -2124,12 +2144,16 @@
// does local field have a value set?
DataField datafield = getDataField(localField);
- if (datafield == null || !datafield.isValueSet()) continue;
+ if (datafield == null || !datafield.isValueSet()) {
+ continue;
+ }
// only set field if we have a value
Object valObj = datafield.getValue();
String value = null;
- if (valObj != null) value = valObj.toString();
+ if (valObj != null) {
+ value = valObj.toString();
+ }
if (value != null && value.length() > 0) {
detailObj.setField(foreignField, value);
foundValues = true;
@@ -2460,8 +2484,9 @@
for (Iterator i = getJDBCMetaData().getKeyFieldListArray().iterator(); i.hasNext();) {
String fieldValue = getField((String) i.next());
- if (fieldValue == null || fieldValue.length() == 0)
+ if (fieldValue == null || fieldValue.length() == 0) {
continue;
+ }
blankKey = false;
if (needSlash) {
@@ -2832,23 +2857,23 @@
* @param formatPattern A formatting pattern according to java.text.DecimalFormat.
* Leave null for the default format for this locale.
* <pre>
- * Symbol Meaning
- * 0 a digit
- * # a digit, zero shows as absent
- * . placeholder for decimal separator
- * , placeholder for grouping separator.
- * E separates mantissa and exponent for exponential formats.
- * ; separates formats.
- * - default negative prefix.
- * % multiply by 100 and show as percentage
- * ? multiply by 1000 and show as per mille
- * � currency sign; replaced by currency symbol; if
- * doubled, replaced by international currency symbol.
- * If present in a pattern, the monetary decimal separator
- * is used instead of the decimal separator.
- * X any other characters can be used in the prefix or suffix
- * ' used to quote special characters in a prefix or suffix.
- * </pre>
+ * Symbol Meaning
+ * 0 a digit
+ * # a digit, zero shows as absent
+ * . placeholder for decimal separator
+ * , placeholder for grouping separator.
+ * E separates mantissa and exponent for exponential formats.
+ * ; separates formats.
+ * - default negative prefix.
+ * % multiply by 100 and show as percentage
+ * ? multiply by 1000 and show as per mille
+ * � currency sign; replaced by currency symbol; if
+ * doubled, replaced by international currency symbol.
+ * If present in a pattern, the monetary decimal separator
+ * is used instead of the decimal separator.
+ * X any other characters can be used in the prefix or suffix
+ * ' used to quote special characters in a prefix or suffix.
+ * </pre>
* @return The Date object equivilant to this field's value
* @throws DBException If the field does not exist or it's value
* is not a date or cannot be converted to a date
@@ -4478,7 +4503,9 @@
DataFieldMetaData oneField = getFieldMetaData(oneName);
if (oneField != null && !oneField.isVirtual()) {
String value = getFieldData(oneField.getName());
- if (value != null && value.length() > 0) return false;
+ if (value != null && value.length() > 0) {
+ return false;
+ }
}
} /* for each field */
@@ -6615,10 +6642,13 @@
fsb.append("{ ");
for (int k = 0; k < fieldNames.length; ++k) {
- if (k > 0) fsb.append(',');
+ if (k > 0) {
+ fsb.append(',');
+ }
fsb.append(fieldNames[k]);
- if (metaData.getFieldMetadata(fieldNames[k]).isKey())
+ if (metaData.getFieldMetadata(fieldNames[k]).isKey()) {
fsb.append('*');
+ }
fsb.append(" = ");
fsb.append(getField(fieldNames[k]));
fsb.append(" ");
@@ -7415,10 +7445,11 @@
*/
public Class setFilterClass(Class filter) {
Class old = mFilter;
- if (filter == null)
+ if (filter == null) {
mFilter = null;
- else
+ } else {
mFilter = filter;
+ }
return old;
}
@@ -7433,10 +7464,11 @@
*/
public Filter setFilterClass(Filter filter) {
Class old = mFilter;
- if (filter == null)
+ if (filter == null) {
mFilter = null;
- else
+ } else {
mFilter = filter.getClass();
+ }
Filter result = null;
if (old != null) {
@@ -7457,7 +7489,9 @@
* @return Category for logging
*/
public Logger getLogger() {
- if (slog == null) slog = Logger.getLogger(getClass().getName());
+ if (slog == null) {
+ slog = Logger.getLogger(getClass().getName());
+ }
return slog;
}
Index: SecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java -u -r1.54 -r1.55
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/SecuredDBObject.java
@@ -808,8 +808,9 @@
*/
public void copyAttributes(DBObject returnObj) throws DBException {
super.copyAttributes(returnObj);
- if (returnObj instanceof SecuredDBObject)
+ if (returnObj instanceof SecuredDBObject) {
((SecuredDBObject) returnObj).setRequestingUid(getRequestingUid());
+ }
}
/**
Index: AuditedSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java
@@ -75,8 +75,8 @@
* for these objects to work properly.
*
* @author Adam Rossi, PlatinumSolutions
- * <p/>
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+ * <p/>
+ * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
* @since $DatabaseSchema $Date$
*/
public class AuditedSecuredDBObject extends SecuredDBObject {
Index: ValidValue.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java
@@ -312,8 +312,9 @@
* @return true if the two objects are equal
*/
public boolean equals(Object o) {
- if (!(o instanceof ValueComparator))
+ if (!(o instanceof ValueComparator)) {
return false;
+ }
ValueComparator ref = (ValueComparator) o;
return reverse == ref.reverse;
}
@@ -405,8 +406,9 @@
* @return true if the objects are equal.
*/
public boolean equals(Object o) {
- if (!(o instanceof DescriptionComparator))
+ if (!(o instanceof DescriptionComparator)) {
return false;
+ }
DescriptionComparator ref = (DescriptionComparator) o;
return reverse == ref.reverse;
}
Index: MultiDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -u -r1.57 -r1.58
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
@@ -526,7 +526,9 @@
if (selectDistinct) {
myStatement.append(" DISTINCT ");
}
- if (StringUtil.isBlankOrNull(expr)) expr = "*";
+ if (StringUtil.isBlankOrNull(expr)) {
+ expr = "*";
+ }
myStatement.append("COUNT(" + expr + ") ");
// ----------------------------------------------------
@@ -1045,8 +1047,9 @@
oneObj.getDataField(oneFieldName).checkValue();
oneObj.getDataField(oneFieldName).setValue(origValue);
}
- } else
+ } else {
oneObj.getDataField(oneFieldName).checkValue();
+ }
if (addWhere) {
@@ -2131,10 +2134,11 @@
log.debug("Executing " + sqlQuery);
}
- if (fieldCount > 0)
+ if (fieldCount > 0) {
myConnection.execute(sqlQuery);
- else
+ } else {
myConnection.executeUpdate(sqlQuery);
+ }
int recordCount = 0;
while (fieldCount > 0 && myConnection.next()) {
@@ -2188,7 +2192,9 @@
for (Iterator iterator = model.getMetaData().getAllFieldsMap().values().iterator(); iterator.hasNext();) {
DBField oneField = (DBField) iterator.next();
try {
- if (oneField.isVirtual) continue; // ignore virtual fields
+ if (oneField.isVirtual) {
+ continue; // ignore virtual fields
+ }
String fieldName = oneField.getName();
if (isFieldNull(shortName, fieldName)) {
@@ -2236,7 +2242,9 @@
private String getTableName(DBObject oneObj)
throws DataException {
String name = (String) oneObj.getAttribute(SHORT_NAME);
- if (name != null && shortNameAsAlias) return name;
+ if (name != null && shortNameAsAlias) {
+ return name;
+ }
return oneObj.getJDBCMetaData().getTargetSQLTable(oneObj.getDataContext());
}
Index: DBSequence.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBSequence.java
@@ -149,8 +149,6 @@
}
/**
- *
- *
* @throws DBException
*/
public void add()
Index: DBObjectDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java -u -r1.48 -r1.49
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java
@@ -1606,8 +1606,9 @@
int N = fieldNamesInOrder.size();
String[] arr = new String[N];
- for (int j = 0; j < N; ++j)
+ for (int j = 0; j < N; ++j) {
arr[j] = (String) fieldNamesInOrder.get(j);
+ }
return arr;
} /* getFields() */
Index: Messages.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/Messages.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/Messages.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/Messages.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/Messages.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/Messages.java
@@ -320,7 +320,9 @@
result = getStringOrNull(defaultSchema, ourLocale, stringCode, args);
}
- if (result == null) result = stringCode;
+ if (result == null) {
+ result = stringCode;
+ }
return result;
}
@@ -405,7 +407,9 @@
for (ListIterator li = schemaStack.listIterator(schemaStack.size()); li.hasPrevious();) {
String schema = (String) li.previous();
result = getStringOrNull(schema, ourLocale, stringCode, args);
- if (result != null) break;
+ if (result != null) {
+ break;
+ }
}
if (result == null) {
Index: MessageBundle.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/MessageBundle.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/MessageBundle.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/MessageBundle.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/MessageBundle.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/i18n/MessageBundle.java
@@ -364,7 +364,9 @@
if (!DEFAULT_BUNDLE_PATH.equals(bundlePath)) {
result = getStringFromDefaultSchemaBundle(ourLocale, stringCode);
}
- if (result == null) throw new RuntimeException("cannot find translated string");
+ if (result == null) {
+ throw new RuntimeException("cannot find translated string");
+ }
}
return result;
}
Index: Job.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -u -r1.30 -r1.31
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
@@ -697,7 +697,9 @@
*/
protected String getJobParameter(String paramCode)
throws DBException {
- if (paramCode == null) return null;
+ if (paramCode == null) {
+ return null;
+ }
if (this.jobParameterValueMap == null) {
if (hasParameters()) {
Index: LogHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/LogHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/LogHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/LogHandler.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/LogHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/LogHandler.java
@@ -229,9 +229,7 @@
} /* finalize() */
/**
- *
- *
- * @throws LogException
+ * @throws LogException
*/
public static void flush()
throws LogException {
Index: DateTime.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/DateTime.java
@@ -485,10 +485,11 @@
}
}
- if (dateOnly)
+ if (dateOnly) {
pattern = datePattern;
- else
+ } else {
pattern = dateTimePattern;
+ }
return pattern;
}
@@ -525,8 +526,9 @@
} catch (Exception e) {
fsb.append(c).append(c);
}
- while (i < n - 1 && c == p.charAt(i + 1))
+ while (i < n - 1 && c == p.charAt(i + 1)) {
i++;
+ }
}
break;
default:
Index: Base64.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/Base64.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/Base64.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/Base64.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/Base64.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/Base64.java
@@ -232,8 +232,9 @@
" must not be greater than zero length");
}
//Append as many zeros as necessary to make things work.
- for (; data.length() % 4 != 0; data = data + "=")
+ for (; data.length() % 4 != 0; data = data + "=") {
;
+ }
return decode(data);
} /* decodeNoPadding(String) */
Index: ByteArrayDataSource.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ByteArrayDataSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ByteArrayDataSource.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ByteArrayDataSource.java -u -r1.4 -r1.5
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ByteArrayDataSource.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ByteArrayDataSource.java
@@ -126,8 +126,9 @@
* @throws IOException if there is I/O error
*/
public InputStream getInputStream() throws IOException {
- if (data == null)
+ if (data == null) {
throw new IOException("no data");
+ }
return new ByteArrayInputStream(data);
}
Index: EventHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventHandler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventHandler.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventHandler.java
@@ -210,9 +210,7 @@
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public static void flush()
throws DBException {
@@ -245,8 +243,9 @@
ByteArrayDataSource attachments[]) {
if (log.isDebugEnabled()) {
String msg = "";
- if (attachments != null)
+ if (attachments != null) {
msg = " with " + attachments.length + " virtual data source attachments.";
+ }
log.debug("Queueing notice to user " + uid + " of '" + subject + "'" + msg);
}
Index: HTMLUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/HTMLUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/HTMLUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/HTMLUtil.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/HTMLUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/HTMLUtil.java
@@ -89,8 +89,9 @@
* @return The converted HTML text including symbolic codes string
*/
public static String text2html(String text) {
- if (text == null)
+ if (text == null) {
return text;
+ }
StringBuffer t = new StringBuffer(text.length() + 10); // 10 is just a test value, could be anything, should affect performance
for (int i = 0; i < text.length(); i++) {
char c = text.charAt(i);
@@ -116,8 +117,9 @@
* @return The converted text without symbolic codes string
*/
public static String html2text(String text) {
- if (text == null)
+ if (text == null) {
return text;
+ }
StringBuffer t = new StringBuffer(text.length());
initSortedArray();
for (int i = 0; i < text.length(); i++) {
@@ -125,8 +127,9 @@
if (c == '&') {
String code = String.valueOf(c);
do {
- if (++i >= text.length())
+ if (++i >= text.length()) {
break;
+ }
if (text.charAt(i) == '&') {
i--;
break;
Index: XmlDocTypeFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/XmlDocTypeFilter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/XmlDocTypeFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/XmlDocTypeFilter.java -u -r1.11 -r1.12
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/XmlDocTypeFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/XmlDocTypeFilter.java
@@ -164,8 +164,6 @@
}
/**
- *
- *
* @throws SAXException
*/
public void endCDATA() throws SAXException {
@@ -203,8 +201,6 @@
}
/**
- *
- *
* @throws SAXException
*/
public void startCDATA() throws SAXException {
Index: JavascriptUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/JavascriptUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/JavascriptUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/JavascriptUtil.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/JavascriptUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/JavascriptUtil.java
@@ -124,8 +124,9 @@
s1 = s + " = " + obj.toString() + ";\n";
return s1;
}
- if (i >= j)
+ if (i >= j) {
return "";
+ }
if (obj instanceof Hashtable) {
s1 = s + " = " + "new Object();\n";
for (Enumeration enumeration = ((Hashtable) obj).keys();
@@ -164,8 +165,9 @@
Class class1 = obj.getClass();
Class class2 = class1.getSuperclass();
- if (class2 == null)
+ if (class2 == null) {
class2 = java.lang.Object.class;
+ }
PropertyDescriptor apropertydescriptor[] =
Introspector.getBeanInfo(class1, class2).getPropertyDescriptors();
s1 = s + " = " + "new Object();\n";
@@ -174,10 +176,11 @@
if (method != null) {
String s6 = s + "." + apropertydescriptor[i1].getName();
Object obj3 = method.invoke(obj, (Object[]) null);
- if (obj3 == null)
+ if (obj3 == null) {
s1 = s1 + s6 + " = \"\";\n";
- else
+ } else {
s1 = s1 + addToJS(obj3, s6, i + 1, j);
+ }
}
}
@@ -198,8 +201,9 @@
s1 = s + " = " + obj.toString() + ";\n";
return s1;
}
- if (i >= j)
+ if (i >= j) {
return "";
+ }
if (obj instanceof Hashtable) {
s1 = s + " = " + "new Object();\n";
for (Enumeration enumeration = ((Hashtable) obj).keys();
@@ -236,10 +240,12 @@
}
Class class2 = obj.getClass();
- if (class1 == null)
+ if (class1 == null) {
class1 = class2.getSuperclass();
- if (class1 == null)
+ }
+ if (class1 == null) {
class1 = java.lang.Object.class;
+ }
PropertyDescriptor apropertydescriptor[] =
Introspector.getBeanInfo(class2, class1).getPropertyDescriptors();
s1 = s + " = " + "new Object();\n";
@@ -248,10 +254,11 @@
if (method != null) {
String s6 = s + "." + apropertydescriptor[i1].getName();
Object obj3 = method.invoke(obj, (Object[]) null);
- if (obj3 == null)
+ if (obj3 == null) {
s1 = s1 + s6 + " = \"\";\n";
- else
+ } else {
s1 = s1 + addToJS(obj3, s6, i + 1, j);
+ }
}
}
@@ -281,8 +288,9 @@
s1 = s + " = " + obj.toString() + ";";
return s1;
}
- if (i >= j)
+ if (i >= j) {
return "";
+ }
if (obj instanceof Hashtable) {
s1 = s + " = " + "new Object();";
for (Enumeration enumeration = ((Hashtable) obj).keys();
@@ -311,8 +319,9 @@
Class class1 = obj.getClass();
Class class2 = class1.getSuperclass();
- if (class2 == null)
+ if (class2 == null) {
class2 = java.lang.Object.class;
+ }
PropertyDescriptor apropertydescriptor[] =
Introspector.getBeanInfo(class1, class2).getPropertyDescriptors();
s1 = s + " = " + "new Object();";
@@ -321,10 +330,11 @@
if (method != null) {
String s5 = s + "." + apropertydescriptor[l].getName();
Object obj3 = method.invoke(obj, (Object[]) null);
- if (obj3 == null)
+ if (obj3 == null) {
s1 = s1 + s5 + " = \"\";";
- else
+ } else {
s1 = s1 + addToJSVector(obj3, s5, i + 1, j);
+ }
}
}
@@ -340,8 +350,9 @@
* @return String
*/
public static String changeString(String s, String s1, String s2) {
- if (s == null)
+ if (s == null) {
return s;
+ }
int i = -1;
for (int j = s.indexOf(s1); j != -1 && i != 0; i--) {
s = s.substring(0, j) + s2 + s.substring(j + s1.length());
Index: InetOutputStream.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/InetOutputStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/InetOutputStream.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/InetOutputStream.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/InetOutputStream.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/InetOutputStream.java
@@ -190,9 +190,7 @@
/**
- *
- *
- * @throws IOException
+ * @throws IOException
*/
synchronized public void println()
throws IOException {
Index: ConfigManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -u -r1.74 -r1.75
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
@@ -1401,8 +1401,9 @@
for (int j = 0; j < actionConfig.length; ++j) {
String controllerName = actionConfig[j].getType();
List list = (List) mapMappings.get(controllerName);
- if (list == null)
+ if (list == null) {
list = new ArrayList();
+ }
list.add(actionConfig[j]);
mapMappings.put(controllerName, list);
if (log.isDebugEnabled()) {
Index: EventQueueEntry.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventQueueEntry.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventQueueEntry.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventQueueEntry.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventQueueEntry.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EventQueueEntry.java
@@ -83,28 +83,44 @@
*/
public class EventQueueEntry {
- /** Is this entry a "notice" or an "event" entry? */
+ /**
+ * Is this entry a "notice" or an "event" entry?
+ */
public boolean isNotice = false;
- /** dbName to use for locating the user to notify */
+ /**
+ * dbName to use for locating the user to notify
+ */
public String dataContext = "";
- /** Subject is only used for notice entries */
+ /**
+ * Subject is only used for notice entries
+ */
public String subject;
- /** Event is only used for Event entries */
+ /**
+ * Event is only used for Event entries
+ */
public String theEvent;
- /** Event text body message used for sending electronic mail */
+ /**
+ * Event text body message used for sending electronic mail
+ */
public String theMessage;
- /** Success status of the event */
+ /**
+ * Success status of the event
+ */
public boolean success;
- /** User id to send notice to - only for notices again */
+ /**
+ * User id to send notice to - only for notices again
+ */
public int uid;
- /** The array collection of virtual byte array data source (attachments) */
+ /**
+ * The array collection of virtual byte array data source (attachments)
+ */
public ByteArrayDataSource attachments[] = null;
/**
Index: EMailSender.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
@@ -648,10 +648,11 @@
* @param from java.lang.String The from address
*/
public String getPersonal() {
- if (personal == null)
+ if (personal == null) {
return new String("");
- else
+ } else {
return this.personal;
+ }
} /* setFromAddress(String) */
Index: CookieBase64.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/CookieBase64.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/CookieBase64.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/CookieBase64.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/CookieBase64.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/CookieBase64.java
@@ -229,8 +229,9 @@
" must not be greater than zero length");
}
//Append as many zeros as necessary to make things work.
- for (; data.length() % 4 != 0; data = data + "=")
+ for (; data.length() % 4 != 0; data = data + "=") {
;
+ }
return decode(data);
} /* decodeNoPadding(String) */
Index: FileUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/FileUtil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/FileUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/FileUtil.java -u -r1.23 -r1.24
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/FileUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/FileUtil.java
@@ -258,9 +258,8 @@
for (int i = 0; i < dir.length; i++) {
if (dir[i].isDirectory()) {
- fileList.addAll(
- getFileListingRecursive(dir[i].getAbsolutePath(), prefixToAdd + dir[i].getName(), separator,
- includeExtension));
+ fileList.addAll(getFileListingRecursive(dir[i].getAbsolutePath(), prefixToAdd + dir[i].getName(), separator,
+ includeExtension));
} else {
if (includeExtension == null || includeExtension.contains(getExtension(dir[i].getName()))) {
oneFileName = dir[i].getName();
Index: StringUtil.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/StringUtil.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/StringUtil.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/StringUtil.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/StringUtil.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/StringUtil.java
@@ -221,7 +221,9 @@
* @return A processed java.util.String
*/
public static String replace(String s, String sub, String with) {
- if (s == null) return null;
+ if (s == null) {
+ return null;
+ }
int c = 0;
int i = s.indexOf(sub, c);
@@ -442,7 +444,9 @@
* @return String The result of substitution
*/
public static String convertCommaToDot(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
return str.replace(',', '.');
}
@@ -518,12 +522,14 @@
* @return boolean true if the string is blank or null
*/
public static boolean isBlankOrNull(String str) {
- if (str == null)
+ if (str == null) {
return true;
- if (str.trim().length() < 1)
+ }
+ if (str.trim().length() < 1) {
return true;
- else
+ } else {
return false;
+ }
}
/**
@@ -691,7 +697,9 @@
* @return String return reformatted string.
*/
public static String reformatDecimalString(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
// replace all ',' by '.'
str = str.replace(',', '.');
@@ -726,7 +734,9 @@
* @return String with the replace value
*/
public static String replaceAll(String text, String key, String value) {
- if (text == null) return null;
+ if (text == null) {
+ return null;
+ }
String buffer = text;
if (buffer != null && key != null && value != null) {
@@ -865,7 +875,9 @@
* @return String
*/
static public String unUpperFirstChar(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
FastStringBuffer fsb = null;
;
@@ -890,7 +902,9 @@
* @return String
*/
static public String upperFirstChar(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
FastStringBuffer fsb = FastStringBuffer.getInstance();
try {
@@ -914,7 +928,9 @@
* @return String
*/
static public String repeatString(String str, int n) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
FastStringBuffer buffer = FastStringBuffer.getInstance();
try {
@@ -959,7 +975,9 @@
* @return String result of the center padding
*/
static public String centerPad(String str, int n, String delim) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
int sz = str.length();
int p = n - sz;
@@ -982,7 +1000,9 @@
* @return String padding string
*/
static public String rightPad(String str, int n, String delim) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
int sz = str.length();
n = (n - sz) / delim.length();
@@ -1031,7 +1051,9 @@
* @return String result
*/
static public String leftPad(String str, int n, String delim) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
int sz = str.length();
n = (n - sz) / delim.length();
if (n > 0) {
@@ -1047,7 +1069,9 @@
* @return a reversed string
*/
static public String reverseString(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
FastStringBuffer fsb = FastStringBuffer.getInstance();
try {
fsb.append(str);
@@ -1066,7 +1090,9 @@
* @return String
*/
static public String swapCase(String str) {
- if (str == null) return null;
+ if (str == null) {
+ return null;
+ }
int sz = str.length();
FastStringBuffer buffer = FastStringBuffer.getInstance();
@@ -1304,7 +1330,9 @@
*/
public static String omitPackages(Object obj) {
int i = obj.getClass().getPackage().getName().length();
- if (i > 0) i++;
+ if (i > 0) {
+ i++;
+ }
return obj.getClass().getName().substring(i);
}
@@ -1316,7 +1344,9 @@
*/
public static String omitPackages(Class theclass) {
int i = theclass.getPackage().getName().length();
- if (i > 0) i++;
+ if (i > 0) {
+ i++;
+ }
return theclass.getName().substring(i);
}
@@ -1356,7 +1386,9 @@
* @return the joined string
*/
public static String join(String[] input, String delimiter) {
- if (input == null) return "";
+ if (input == null) {
+ return "";
+ }
StringBuffer buf = new StringBuffer();
for (int q = 0; q < input.length; ++q) {
@@ -1405,8 +1437,9 @@
char c;
// Case #1 Initial string is smaller than the fixed length
- if (inputLength < fixedLength)
+ if (inputLength < fixedLength) {
return input;
+ }
// Case #2 Word wrapping is required
StringBuffer buf = new StringBuffer(1024);
@@ -1421,25 +1454,35 @@
buf.append(c);
if (c == '\t')
// If current character is a tab increase the line length
+ {
lineLength += 8;
- else if (c == '\n')
+ } else if (c == '\n')
// If current character is a new line, reset the line length
+ {
lineLength = 0;
- else
+ } else
// Increase line space by one
+ {
++lineLength;
+ }
++pos; /*1*/
- if (pos < inputLength) c = input.charAt(pos); /*2*/
+ if (pos < inputLength) {
+ c = input.charAt(pos); /*2*/
+ }
}
// Read the word
StringBuffer word = new StringBuffer(64);
- if (pos < inputLength) c = input.charAt(pos);
+ if (pos < inputLength) {
+ c = input.charAt(pos);
+ }
while (pos < inputLength && !Character.isWhitespace(c)) {
word.append(c);
++pos; /*1*/
- if (pos < inputLength) c = input.charAt(pos); /*2*/
+ if (pos < inputLength) {
+ c = input.charAt(pos); /*2*/
+ }
}
int wordLength = word.length();
@@ -1492,7 +1535,9 @@
* @return true if string is surrounded by search string
*/
public static boolean startsAndEnds(String s, String search) {
- if (s != null && s.length() >= 2 && s.startsWith(search) && s.endsWith(search)) return true;
+ if (s != null && s.length() >= 2 && s.startsWith(search) && s.endsWith(search)) {
+ return true;
+ }
return false;
}
Index: BaseValueParser.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/BaseValueParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/BaseValueParser.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/BaseValueParser.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/BaseValueParser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/BaseValueParser.java
@@ -492,8 +492,9 @@
String[] temp = (String[]) object;
value = new BigDecimal[temp.length];
- for (int i = 0; i < temp.length; i++)
+ for (int i = 0; i < temp.length; i++) {
value[i] = new BigDecimal(temp[i]);
+ }
}
return value;
@@ -584,8 +585,9 @@
String[] temp = (String[]) object;
value = new int[temp.length];
- for (int i = 0; i < temp.length; i++)
+ for (int i = 0; i < temp.length; i++) {
value[i] = Integer.parseInt(temp[i]);
+ }
}
return value;
@@ -606,8 +608,9 @@
String[] temp = (String[]) object;
value = new Integer[temp.length];
- for (int i = 0; i < temp.length; i++)
+ for (int i = 0; i < temp.length; i++) {
value[i] = Integer.valueOf(temp[i]);
+ }
}
return value;
@@ -662,8 +665,9 @@
String[] temp = (String[]) object;
value = new long[temp.length];
- for (int i = 0; i < temp.length; i++)
+ for (int i = 0; i < temp.length; i++) {
value[i] = Long.parseLong(temp[i]);
+ }
}
return value;
@@ -684,8 +688,9 @@
String[] temp = (String[]) object;
value = new Long[temp.length];
- for (int i = 0; i < temp.length; i++)
+ for (int i = 0; i < temp.length; i++) {
value[i] = Long.valueOf(temp[i]);
+ }
}
return value;
Index: MultipartStream.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/MultipartStream.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/MultipartStream.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/MultipartStream.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/MultipartStream.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/upload/MultipartStream.java
@@ -638,11 +638,11 @@
* the <code>buffer</code>, or <code>-1</code> if not found.
*/
protected int findByte(byte value, int pos) {
- for (int i = pos; i < tail; i++)
-
+ for (int i = pos; i < tail; i++) {
if (buffer[i] == value) {
return i;
}
+ }
return -1;
}
Index: User.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -u -r1.46 -r1.47
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
@@ -1298,7 +1298,9 @@
User user = new User();
user.setDataContext(myDBname);
user.setLoginName(login);
- if (!user.find()) throw new DBException("cannot find user: " + login);
+ if (!user.find()) {
+ throw new DBException("cannot find user: " + login);
+ }
return user.getUid();
}
@@ -1315,7 +1317,9 @@
User user = new User();
user.setDataContext(dataContext);
user.setUid(uid);
- if (!user.find()) throw new DBException("cannot find user: " + uid);
+ if (!user.find()) {
+ throw new DBException("cannot find user: " + uid);
+ }
return user;
}
Index: UserInfo.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/UserInfo.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/UserInfo.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/UserInfo.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/UserInfo.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/UserInfo.java
@@ -264,17 +264,13 @@
throws DBException;
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public void sendAuthEmail()
throws DBException;
/**
- *
- *
- * @throws DBException
+ * @throws DBException
*/
public void sendFollowUpEmail()
throws DBException;
Index: StringHash.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/StringHash.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/StringHash.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/StringHash.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/StringHash.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/StringHash.java
@@ -84,9 +84,7 @@
private CryptoManager cryptoManager;
/**
- *
- *
- * @throws ChainedException
+ * @throws ChainedException
*/
public StringHash()
throws ChainedException {
Index: ISO_8859_1.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/ISO_8859_1.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/ISO_8859_1.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/ISO_8859_1.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/ISO_8859_1.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/ISO_8859_1.java
@@ -91,9 +91,7 @@
};
/**
- *
- *
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
*/
public ISO_8859_1()
throws IllegalArgumentException {
Index: gb2312.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/gb2312.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/gb2312.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/gb2312.java -u -r1.5 -r1.6
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/gb2312.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/gb2312.java
@@ -104,7 +104,7 @@
/**
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
*/
public gb2312() throws IllegalArgumentException {
super(specialStringList, replaceList);
Index: HtmlPlusURLFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/HtmlPlusURLFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/HtmlPlusURLFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/HtmlPlusURLFilter.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/HtmlPlusURLFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/HtmlPlusURLFilter.java
@@ -147,7 +147,9 @@
return url;
}
String validUrl = url;
- if (!hasValidUrlPrefix(url)) validUrl = "http://" + url;
+ if (!hasValidUrlPrefix(url)) {
+ validUrl = "http://" + url;
+ }
return validUrl;
}
@@ -227,8 +229,9 @@
for (int i = 0; i < URL_TYPES.length; i++) {
String urlType = URL_TYPES[i];
hIndex = s.indexOf(urlType);
- if (hIndex != -1)
+ if (hIndex != -1) {
break;
+ }
}
if (hIndex == -1) {
Index: AllowedHtmlPlusURLFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/AllowedHtmlPlusURLFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/AllowedHtmlPlusURLFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/AllowedHtmlPlusURLFilter.java -u -r1.3 -r1.4
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/AllowedHtmlPlusURLFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/AllowedHtmlPlusURLFilter.java
@@ -90,7 +90,9 @@
}
private static String[] appendArrays(String[] array1, String[] array2) {
- if (array1 == null || array2 == null) return null;
+ if (array1 == null || array2 == null) {
+ return null;
+ }
int totalLength = array1.length + array2.length;
String resultArray[] = new String[totalLength];
Index: XmlFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/XmlFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/XmlFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/XmlFilter.java -u -r1.3 -r1.4
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/XmlFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/XmlFilter.java
@@ -83,9 +83,7 @@
};
/**
- *
- *
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
*/
public XmlFilter()
throws IllegalArgumentException {
Index: StringEncryption.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption/StringEncryption.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption/StringEncryption.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption/StringEncryption.java -u -r1.9 -r1.10
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption/StringEncryption.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/weakencryption/StringEncryption.java
@@ -87,9 +87,7 @@
static protected ByteArrayCounter ivCounter = new ByteArrayCounter(8);
/**
- *
- *
- * @throws ChainedException
+ * @throws ChainedException
*/
public StringEncryption()
throws ChainedException {
Index: DBTool.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -u -r1.54 -r1.55
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
@@ -843,7 +843,9 @@
if (tableName != null && tableName.length() > 0) {
String genStr = "\tTable = " +
tableName;
- if (StringUtil.notNull(schemaName).length() > 0) genStr += " and schema = " + schemaName;
+ if (StringUtil.notNull(schemaName).length() > 0) {
+ genStr += " and schema = " + schemaName;
+ }
System.out.println(gen