details: /erp/devel/pi/rev/c3b02098e6c4
changeset: 7611:c3b02098e6c4
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Jun 15 15:00:54 2010 +0200
summary: Fixed formatting issue on OBContext class
details: /erp/devel/pi/rev/16da803e2327
changeset: 7612:16da803e2327
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Jun 15 15:01:59 2010 +0200
summary: Related to issue 13423. Fixed wrong comment in javadoc
diffstat:
src/org/openbravo/dal/core/OBContext.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diffs (64 lines):
diff -r f517c5f46e98 -r 16da803e2327 src/org/openbravo/dal/core/OBContext.java
--- a/src/org/openbravo/dal/core/OBContext.java Tue Jun 15 15:27:00 2010 +0530
+++ b/src/org/openbravo/dal/core/OBContext.java Tue Jun 15 15:01:59 2010 +0200
@@ -133,7 +133,7 @@
* To restore the previous privileges call the {...@link
#restorePreviousMode()}.
*
* @see OBContext#restorePreviousMode()
- * @since 2.50MP16
+ * @since 2.50MP18
*/
public static void setAdminMode() {
getAdminModeStack().push(Boolean.TRUE);
@@ -167,7 +167,7 @@
* {...@link #setAdminMode()}.
*
* @see OBContext#setAdminMode()
- * @since 2.50MP16
+ * @since 2.50MP18
*/
public static void restorePreviousMode() {
// remove the last admin mode from the stack
@@ -184,10 +184,11 @@
}
}
if (ADMIN_TRACE_SIZE == 0) {
- log.warn(
- "Unbalanced calls to setAdminMode and restorePreviousMode. "
- + "Consider setting the constant OBContext.ADMIN_TRACE_SIZE to
a value higher than 0 to debug this situation",
- new IllegalStateException());
+ log
+ .warn(
+ "Unbalanced calls to setAdminMode and restorePreviousMode. "
+ + "Consider setting the constant
OBContext.ADMIN_TRACE_SIZE to a value higher than 0 to debug this situation",
+ new IllegalStateException());
} else {
log.warn("Unbalanced calls to setAdminMode and restorePreviousMode" +
sb.toString(),
new IllegalStateException());
@@ -281,9 +282,10 @@
return;
}
if (context != null && context == adminContext) {
- log.warn("Trying to set the admin context in the session, "
- + "this means that the context has not been reset correctly in a
finally block."
- + " When using the admin context it should always be removed in a
finally block by the application");
+ log
+ .warn("Trying to set the admin context in the session, "
+ + "this means that the context has not been reset correctly in a
finally block."
+ + " When using the admin context it should always be removed in
a finally block by the application");
return;
}
session.setAttribute(CONTEXT_PARAM, context);
@@ -712,9 +714,9 @@
Check.isNotNull(getRole(), "Role may not be null");
if (orgId != null) {
- final Organization o = getOne(Organization.class,
- "select r from " + Organization.class.getName() + " r where " + "
r."
- + Organization.PROPERTY_ID + "='" + orgId + "'");
+ final Organization o = getOne(Organization.class, "select r from "
+ + Organization.class.getName() + " r where " + " r." +
Organization.PROPERTY_ID + "='"
+ + orgId + "'");
setCurrentOrganization(o);
} else if (getUser().getDefaultOrganization() != null
&& getUser().getDefaultOrganization().isActive()) {
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
