[jbpm-commits] JBoss JBPM SVN: r6757 - jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Oct 11 21:40:27 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-10-11 21:40:26 -0400 (Mon, 11 Oct 2010)
New Revision: 6757
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/BusinessCalendar.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/DayPart.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Duration.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Holiday.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableInstance.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/Timer.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/HolidayTest.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java
jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/config/ConfigurationLocator.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/impl/UpdatesHashMap.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/identity/action/DeleteMembershipActionListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskform/ui/UITaskFormTransitionButton.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java
Log:
remove static business calendar from Timer;
inline and deprecate BusinessCalendar.getCalendar
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/BusinessCalendar.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/BusinessCalendar.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/BusinessCalendar.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -24,7 +24,6 @@
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -108,7 +107,7 @@
}
public Date findStartOfNextDay(Date date) {
- Calendar calendar = getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DATE, 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
@@ -126,7 +125,7 @@
}
Date findEndOfPreviousDay(Date date) {
- Calendar calendar = getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.DATE, -1);
calendar.set(Calendar.HOUR_OF_DAY, 23);
@@ -144,7 +143,7 @@
}
public Day findDay(Date date) {
- Calendar calendar = getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
return getWeekDays()[calendar.get(Calendar.DAY_OF_WEEK)];
}
@@ -182,7 +181,8 @@
return findDayPart(date) != null;
}
+ /** @deprecated call {@link Calendar#getInstance()} directly */
public static Calendar getCalendar() {
- return new GregorianCalendar();
+ return Calendar.getInstance();
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/DayPart.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/DayPart.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/DayPart.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -49,7 +49,7 @@
throw new IllegalArgumentException("failed to parse day part start time: " + dayPartText);
}
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(startTime);
startHour = calendar.get(Calendar.HOUR_OF_DAY);
startMinute = calendar.get(Calendar.MINUTE);
@@ -76,7 +76,7 @@
}
public Date add(Date date, Duration duration) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
int minute = calendar.get(Calendar.MINUTE);
@@ -111,7 +111,7 @@
}
public boolean isStartAfter(Date time) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
@@ -120,7 +120,7 @@
}
boolean endsBefore(Date time) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
@@ -128,7 +128,7 @@
}
public boolean includes(Date time) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
int minute = calendar.get(Calendar.MINUTE);
@@ -138,7 +138,7 @@
}
public Date getStartTime(Date time) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
calendar.set(Calendar.HOUR_OF_DAY, startHour);
calendar.set(Calendar.MINUTE, startMinute);
@@ -146,7 +146,7 @@
}
Date getEndTime(Date time) {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
calendar.set(Calendar.HOUR_OF_DAY, endHour);
calendar.set(Calendar.MINUTE, endMinute);
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Duration.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Duration.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Duration.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -277,7 +277,7 @@
public Date addTo(Date date) {
if (field == Calendar.MILLISECOND) return new Date(date.getTime() + amount);
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(field, (int) amount);
return calendar.getTime();
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Holiday.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Holiday.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/calendar/Holiday.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -84,7 +84,7 @@
}
// now set endDate to the end of the day, rather then the beginning
// take the start of the next day as the end of the endDate
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.setTime(end);
calendar.add(Calendar.DATE, 1);
endDate = calendar.getTime();
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableInstance.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/VariableInstance.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -34,8 +34,7 @@
import org.jbpm.util.ClassUtil;
/**
- * is a jbpm-internal class that serves as a base class for classes that store variable values
- * in the database.
+ * base for classes that store variable values in the database.
*/
public abstract class VariableInstance implements Serializable {
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -68,11 +68,11 @@
ObjectInputStream objectStream = new ObjectInputStream(memoryStream);
return objectStream.readObject();
}
- catch (IOException ex) {
- throw new JbpmException("failed to read object", ex);
+ catch (IOException e) {
+ throw new JbpmException("failed to deserialize object", e);
}
- catch (ClassNotFoundException ex) {
- throw new JbpmException("serialized object class not found", ex);
+ catch (ClassNotFoundException e) {
+ throw new JbpmException("serialized class not found", e);
}
}
@@ -94,11 +94,11 @@
};
return objectStream.readObject();
}
- catch (IOException ex) {
- throw new JbpmException("failed to read object", ex);
+ catch (IOException e) {
+ throw new JbpmException("failed to deserialize object", e);
}
- catch (ClassNotFoundException ex) {
- throw new JbpmException("serialized object class not found", ex);
+ catch (ClassNotFoundException e) {
+ throw new JbpmException("serialized class not found", e);
}
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/Timer.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/Timer.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/Timer.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -21,8 +21,6 @@
private static final long serialVersionUID = 1L;
- private static BusinessCalendar businessCalendar = new BusinessCalendar();
-
private String name;
private String repeat;
private String transitionName;
@@ -83,6 +81,7 @@
Duration interval = new Duration(repeat);
long currentTime = System.currentTimeMillis();
+ BusinessCalendar businessCalendar = new BusinessCalendar();
Date repeatDate = getDueDate();
do {
repeatDate = businessCalendar.add(repeatDate, interval);
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -121,18 +121,18 @@
taskInstance.initializeVariables();
// calculate due date
- String dueDateString;
- if (task != null && (dueDateString = task.getDueDate()) != null) {
+ String dueDateText;
+ if (task != null && (dueDateText = task.getDueDate()) != null) {
Date dueDate;
// evaluate base date expression
- if (dueDateString.startsWith("#{") || dueDateString.startsWith("${")) {
- int braceIndex = dueDateString.indexOf('}');
+ if (dueDateText.startsWith("#{") || dueDateText.startsWith("${")) {
+ int braceIndex = dueDateText.indexOf('}');
if (braceIndex == -1) {
- throw new JbpmException("invalid due date, closing brace missing: " + dueDateString);
+ throw new JbpmException("invalid due date, closing brace missing: " + dueDateText);
}
- String baseDateExpression = dueDateString.substring(0, braceIndex + 1);
+ String baseDateExpression = dueDateText.substring(0, braceIndex + 1);
Object result = JbpmExpressionEvaluator
.evaluate(baseDateExpression, executionContext);
@@ -141,21 +141,22 @@
baseDate = (Date) result;
}
else if (result instanceof Calendar) {
- baseDate = ((Calendar) result).getTime();
+ Calendar calendar = (Calendar) result;
+ baseDate = calendar.getTime();
}
else {
throw new JbpmException(baseDateExpression + " returned " + result
+ " instead of date or calendar");
}
- String durationString = dueDateString.substring(braceIndex + 1).trim();
- if (durationString.length() > 0) {
- char durationSeparator = durationString.charAt(0);
+ String durationText = dueDateText.substring(braceIndex + 1).trim();
+ if (durationText.length() > 0) {
+ char durationSeparator = durationText.charAt(0);
if (durationSeparator != '+' && durationSeparator != '-') {
throw new JbpmException("invalid due date, '+' or '-' missing after expression: "
- + dueDateString);
+ + dueDateText);
}
- dueDate = new BusinessCalendar().add(baseDate, new Duration(durationString));
+ dueDate = new BusinessCalendar().add(baseDate, new Duration(durationText));
}
else {
dueDate = baseDate;
@@ -163,8 +164,7 @@
}
// take current time as base date
else {
- dueDate = new BusinessCalendar()
- .add(Clock.getCurrentTime(), new Duration(dueDateString));
+ dueDate = new BusinessCalendar().add(Clock.getCurrentTime(), new Duration(dueDateText));
}
taskInstance.setDueDate(dueDate);
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -31,7 +31,7 @@
static BusinessCalendar businessCalendar = new BusinessCalendar();
public void testNonBusinessSecondAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 10, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -44,7 +44,7 @@
}
public void testNonBusinessMinuteAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -56,7 +56,7 @@
}
public void testNonBusinessFractionalDurationAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -69,7 +69,7 @@
}
public void testNonBusinessDayAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -81,7 +81,7 @@
}
public void testNonBusinessWeekAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -93,7 +93,7 @@
}
public void testNonBusinessMonthAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -105,7 +105,7 @@
}
public void testNonBusinessYearAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -117,7 +117,7 @@
}
public void testBusinessDurationAdditionOverBusinessTime() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -129,7 +129,7 @@
}
public void testBusinessDurationAdditionOverLunchBreak() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -143,7 +143,7 @@
}
public void testBusinessDurationAdditionOverDayBreak() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 16, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -157,7 +157,7 @@
}
public void testBusinessDurationAdditionOverHoliday() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2010, Calendar.NOVEMBER, 10, 16, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -173,7 +173,7 @@
}
public void testBusinessDurationAdditionOverWeekend() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 8, 16, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -189,7 +189,7 @@
}
public void testTwoBusinessHoursOverLunch() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 15, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -203,7 +203,7 @@
}
public void testBusinessDurationAdditionOutsideBusinessHours() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 8, 12, 15, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -217,7 +217,7 @@
}
public void testBusinessDurationAdditionOutsideBusinessHoursOverWeekend() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 8, 12, 15, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -235,7 +235,7 @@
}
public void testBusinessFractionalDurationAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 7, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -252,7 +252,7 @@
}
public void testBusinessDayAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 7, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -264,7 +264,7 @@
}
public void testBusinessWeekAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 7, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -277,7 +277,7 @@
}
public void testBusinessMonthAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2010, Calendar.FEBRUARY, 8, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -290,7 +290,7 @@
}
public void testBusinessYearAddition() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2010, Calendar.FEBRUARY, 8, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/HolidayTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/HolidayTest.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/calendar/HolidayTest.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -34,7 +34,7 @@
DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Holiday holiday = new Holiday("21/07/2005", dateFormat, null);
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.YEAR, 2005);
calendar.set(Calendar.MONTH, Calendar.JULY);
calendar.set(Calendar.DAY_OF_MONTH, 21);
@@ -62,7 +62,7 @@
DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Holiday holiday = new Holiday("1/7/2005 - 31/8/2005", dateFormat, null);
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.YEAR, 2005);
calendar.set(Calendar.MONTH, Calendar.JULY);
calendar.set(Calendar.DAY_OF_MONTH, 1);
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -21,7 +21,6 @@
*/
package org.jbpm.jbpm1072;
-import org.jbpm.JbpmConfiguration;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Event;
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1776/JBPM1776Test.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -39,7 +39,7 @@
static BusinessCalendar businessCalendar = new BusinessCalendar();
public void testNonBusinessSecondSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 10, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -52,7 +52,7 @@
}
public void testNonBusinessMinuteSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -64,7 +64,7 @@
}
public void testNonBusinessFractionalDurationSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -77,7 +77,7 @@
}
public void testNonBusinessDaySubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -89,7 +89,7 @@
}
public void testNonBusinessWeekSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -101,7 +101,7 @@
}
public void testNonBusinessMonthSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -113,7 +113,7 @@
}
public void testNonBusinessYearSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2008, Calendar.FEBRUARY, 5, 6, 30, 45);
calendar.set(Calendar.MILLISECOND, 125);
Date start = calendar.getTime();
@@ -125,7 +125,7 @@
}
public void testBusinessDurationSubtractionOverBusinessTime() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 11, 55, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -137,7 +137,7 @@
}
public void testBusinessDurationSubtractionOverLunchBreak() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 12, 35, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -151,7 +151,7 @@
}
public void testBusinessDurationSubtractionOverDayBreak() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 8, 9, 5, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -165,7 +165,7 @@
}
public void testBusinessDurationSubtractionOverHoliday() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2010, Calendar.NOVEMBER, 12, 9, 5, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -181,7 +181,7 @@
}
public void testBusinessDurationSubtractionOverWeekend() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 11, 9, 5, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -197,7 +197,7 @@
}
public void testTwoBusinessHoursOverLunch() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 7, 13, 45, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -211,7 +211,7 @@
}
public void testBusinessDurationSubtractionOutsideBusinessHours() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 8, 12, 15, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -225,7 +225,7 @@
}
public void testBusinessDurationSubtractionOutsideBusinessHoursOverWeekend() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.APRIL, 11, 12, 15, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -243,7 +243,7 @@
}
public void testBusinessDaySubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.FEBRUARY, 21, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -255,7 +255,7 @@
}
public void testBusinessWeekSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2005, Calendar.MARCH, 14, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -268,7 +268,7 @@
}
public void testBusinessMonthSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2010, Calendar.MAY, 7, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
@@ -281,7 +281,7 @@
}
public void testBusinessYearSubtraction() {
- Calendar calendar = BusinessCalendar.getCalendar();
+ Calendar calendar = Calendar.getInstance();
calendar.set(2011, Calendar.FEBRUARY, 9, 9, 30, 0);
calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
Modified: jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml 2010-10-09 17:55:08 UTC (rev 6756)
+++ jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml 2010-10-12 01:40:26 UTC (rev 6757)
@@ -1,4 +1,4 @@
-<project name="jBPM SOA Sub-Builder" default="default">
+<project name="jBPM SOA Sub-Builder">
<!--
!! Define convenience variables for this build file here. Avoid duplicate properties existed in dependencies!
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/config/ConfigurationLocator.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/config/ConfigurationLocator.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/config/ConfigurationLocator.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -75,7 +75,7 @@
this.elemName = elemName;
}
- private String getName() {
+ String getName() {
return elemName;
}
}
@@ -105,7 +105,7 @@
private static final class ElementIterable implements Iterable<Element> {
private final Element element;
- private ElementIterable(final Element element) {
+ ElementIterable(final Element element) {
this.element = element;
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/impl/UpdatesHashMap.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/impl/UpdatesHashMap.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/impl/UpdatesHashMap.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -17,9 +17,9 @@
private static final long serialVersionUID = 1L;
- private final Map<String,Object> backingMap;
- private final Set<String> updates;
- private final Set<String> deletes;
+ final Map<String,Object> backingMap;
+ final Set<String> updates;
+ final Set<String> deletes;
public UpdatesHashMap() {
backingMap = new HashMap<String, Object>();
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/identity/action/DeleteMembershipActionListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/identity/action/DeleteMembershipActionListener.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/identity/action/DeleteMembershipActionListener.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -36,7 +36,7 @@
final ELContext elContext = facesContext.getELContext();
final User user = (User) userExpression.getValue(elContext);
final long membershipId = ((Long)membershipIdExpression.getValue(elContext)).longValue();
- final Set<Membership> membershipSet = (Set<Membership>) user.getMemberships();
+ final Set<Membership> membershipSet = user.getMemberships();
final Iterator<Membership> it = membershipSet.iterator();
while (it.hasNext()) {
Membership membership = it.next();
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskform/ui/UITaskFormTransitionButton.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskform/ui/UITaskFormTransitionButton.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskform/ui/UITaskFormTransitionButton.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -49,11 +49,11 @@
transition = state.transition;
}
- private static final class State implements Serializable {
+ static final class State implements Serializable {
private static final long serialVersionUID = 1L;
- private Object superState;
- private String transition;
+ Object superState;
+ String transition;
}
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -86,14 +86,14 @@
super.restoreState(context, state.superState);
}
- public static class State implements Serializable {
+ static class State implements Serializable {
private static final long serialVersionUID = 1L;
- private Object superState;
+ Object superState;
- private String headerClass;
- private String headerStyle;
- private String styleClass;
- private String style;
+ String headerClass;
+ String headerStyle;
+ String styleClass;
+ String style;
}
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -123,18 +123,18 @@
super.restoreState(context, state.superState);
}
- public static class State implements Serializable {
+ static class State implements Serializable {
private static final long serialVersionUID = 1L;
- private Object superState;
+ Object superState;
- private int columns;
- private boolean columnsSet;
- private String headerClass;
- private String headerStyle;
- private String footerClass;
- private String footerStyle;
- private String styleClass;
- private String style;
+ int columns;
+ boolean columnsSet;
+ String headerClass;
+ String headerStyle;
+ String footerClass;
+ String footerStyle;
+ String styleClass;
+ String style;
}
}
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2010-10-09 17:55:08 UTC (rev 6756)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2010-10-12 01:40:26 UTC (rev 6757)
@@ -108,16 +108,16 @@
super.restoreState(context, state.superState);
}
- public static class State implements Serializable {
+ static class State implements Serializable {
private static final long serialVersionUID = 1L;
- private Object superState;
+ Object superState;
- private String headerClass;
- private String headerStyle;
- private String footerClass;
- private String footerStyle;
- private String styleClass;
- private String style;
+ String headerClass;
+ String headerStyle;
+ String footerClass;
+ String footerStyle;
+ String styleClass;
+ String style;
}
}
More information about the jbpm-commits
mailing list