Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.118.2.39 -r1.118.2.40 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 11 May 2016 07:14:44 -0000 1.118.2.39 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 20 Jun 2016 08:47:21 -0000 1.118.2.40 @@ -104,18 +104,6 @@ *

* * @author Jacky Fang - * @since 2005-4-15 - * @version 1.1 - * - * - * - * - * - * - * - * - * - * */ public class MonitoringAction extends LamsDispatchAction { @@ -1090,15 +1078,14 @@ activityJSON.put("type", activity.getActivityTypeId()); Activity parentActivity = activity.getParentActivity(); - if (activity.isBranchingActivity() && (((BranchingActivity) activity).getXcoord() == null)) { + if (activity.isBranchingActivity() && (activity.getXcoord() == null)) { // old branching is just a rectangle like Tool // new branching has start and finish points, it's exploded activityJSON.put("x", MonitoringAction.getActivityCoordinate(((BranchingActivity) activity).getStartXcoord())); activityJSON.put("y", MonitoringAction.getActivityCoordinate(((BranchingActivity) activity).getStartYcoord())); - } else if (activity.isOptionsWithSequencesActivity() - && (((OptionsWithSequencesActivity) activity).getXcoord() == null)) { + } else if (activity.isOptionsWithSequencesActivity() && (activity.getXcoord() == null)) { // old optional sequences is just a long rectangle // new optional sequences has start and finish points, it's exploded activityJSON.put("x", MonitoringAction