Changeset 615

Timestamp:

03/28/11 22:21:10 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model

Files:

• report/AggregatorGraphModel.java (modified) (1 diff)
• report/Presentation.java (moved) (moved from raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/Presentation.java) (1 diff)
• report/Series.java (moved) (moved from raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/Series.java) (1 diff)
• wsmodel/StatisticParameters.java (modified) (4 diffs)

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/report/AggregatorGraphModel.java

@@ -5 +5 @@
 import java.util.List;
 
-import uk.ac.cardiff.model.Presentation;
 
 

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/report/Presentation.java

@@ -2 +2 @@
  *
  */
-package uk.ac.cardiff.model;
+package uk.ac.cardiff.model.report;
 
 import java.io.Serializable;

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/report/Series.java

@@ -2 +2 @@
  *
  */
-package uk.ac.cardiff.model;
+package uk.ac.cardiff.model.report;
 
 import java.io.Serializable;

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/StatisticParameters.java

@@ -18 +18 @@
 import org.joda.time.format.DateTimeFormatter;
 
-import uk.ac.cardiff.model.Presentation;
-import uk.ac.cardiff.model.Series;
 import uk.ac.cardiff.model.event.Event;
+import uk.ac.cardiff.model.report.Presentation;
+import uk.ac.cardiff.model.report.Series;
 import uk.ac.cardiff.model.sql.SQLFilter;
 
@@ -39 +39 @@
     private String unitName;
 
-    /* List of parameters passed into the <code>performStatistic</code> method*/
-    private List<MethodParameter> methodParams;
-
-    /*
+    /** List of parameters passed into the <code>performStatistic</code> method*/
+    private List<MethodParameter> methodParameters;
+
+    /**
      * the start time from which to produce the starts, defining the temporal extent If a starttime and endtime is not given, the entire temporal extent of the
      * data series will be used
@@ -48 +48 @@
     private DateTime startTime;
 
-    /* the end time from which to produce the starts, defining the temporal extent */
+    /** the end time from which to produce the starts, defining the temporal extent */
     private DateTime endTime;
 
-    /*Its important that these dates (used for display in trinidad) are kept in sync with the
+    /** Its important that these dates (used for display in trinidad) are kept in sync with the
      * Joda DateTime classes above*/
     private Date startTimeJava;
     private Date endTimeJava;
 
-    /* either system or user types */
+    /** either system or user types */
     public enum StatisticType {
         /*
@@ -96 +96 @@
 
     public void setMethodParams(List<MethodParameter> methodParams) {
-        this.methodParams = methodParams;
+        this.methodParameters = methodParams;
     }
 
     public List<MethodParameter> getMethodParams() {
-        return methodParams;
+        return methodParameters;
     }