Changeset 805

Timestamp:

05/16/11 00:22:40 (2 years ago)

Author:

philsmart

Message:

 

Location:

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

Files:

• event/event.hbm.xml (modified) (1 diff)
• report/AggregatorGraphModel.java (modified) (2 diffs)
• resource/ResourceMetadata.java (modified) (3 diffs)
• wsmodel/Capabilities.java (modified) (3 diffs)
• wsmodel/StatisticParameters.java (modified) (4 diffs)

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/event/event.hbm.xml

@@ -12 +12 @@
                 <id name="persistantId" column="persistantId" type="long"
                         unsaved-value="0">
-                        <generator class="native">
+                        <!-- <generator class="native">
                                 <param name="sequence">hib_entity_seq</param>
-                        </generator>
+                        </generator> -->
+            <generator class="hilo">
+
+            </generator>
                 </id>
 

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

@@ -3 +3 @@
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
-
-
 
 /*
@@ -12 +12 @@
  */
 
-public class AggregatorGraphModel implements Serializable{
+public class AggregatorGraphModel implements Serializable {
 
-        /** Class logger */
-        private static final long serialVersionUID = 5372664739350074383L;
-    
-        /** The list of <code>String</code> labels for the groups*/
-        private List<String> groupLabels;
-        
-        /** The list of <code>String</code> labels for each series*/
-        private List<String> seriesLabels;
-        
-        /** The list of <code>Double</code> values assigned to each series */
-        private List<List<Double>> chartValues;
+    /** Class logger */
+    private static final long serialVersionUID = 5372664739350074383L;
 
-        /** A class that holds presentation information for this graph model*/
-        private Presentation presentation;
+    /** The list of <code>String</code> labels for the groups */
+    private List<String> groupLabels;
 
-        public AggregatorGraphModel(){
-            seriesLabels= new ArrayList<String>();
-        }
+    /** The list of <code>String</code> labels for each series */
+    private List<String> seriesLabels;
 
+    /** The list of <code>Double</code> values assigned to each series */
+    private List<List<Double>> chartValues;
 
-        public List<String> getGroupLabels() {
-                  return groupLabels;
+    /** A class that holds presentation information for this graph model */
+    private Presentation presentation;
 
-        }
+    public AggregatorGraphModel() {
+        seriesLabels = new ArrayList<String>();
+    }
 
-        public void addGroupLabel(String label){
-                if (getGroupLabels()==null)setGroupLabels(new ArrayList<String>());
-                getGroupLabels().add(label);
-        }
+    public List<String> getGroupLabels() {
+        return groupLabels;
 
-        public void addSeriesLabel(String label){
-                if (getSeriesLabels()==null)setSeriesLabels(new ArrayList<String>());
-                getSeriesLabels().add(label);
-        }
+    }
 
+    public void addGroupLabel(String label) {
+        if (getGroupLabels() == null)
+            setGroupLabels(new ArrayList<String>());
+        getGroupLabels().add(label);
+    }
 
-        public List<String> getSeriesLabels() {
-            return seriesLabels;
+    public void addSeriesLabel(String label) {
+        if (getSeriesLabels() == null)
+            setSeriesLabels(new ArrayList<String>());
+        getSeriesLabels().add(label);
+    }
 
-        }
+    public void sortGroupLabelsAlphabetically() {
+        Collections.sort(groupLabels);
 
-        public void addGroupValue(List<Double> values){
-                if (chartValues==null) setChartValues(new ArrayList<List<Double>>());
-                chartValues.add(values);
-        }
+    }
 
+    public List<String> getSeriesLabels() {
+        return seriesLabels;
 
-        public List<List<Double>> getYValues() {
-                    return chartValues;
-        }
+    }
 
-        public void setYValues(List<List<Double>> values) {
+    public void addGroupValue(List<Double> values) {
+        if (chartValues == null)
+            setChartValues(new ArrayList<List<Double>>());
+        chartValues.add(values);
+    }
 
-        }
+    public List<List<Double>> getYValues() {
+        return chartValues;
+    }
 
+    public void setYValues(List<List<Double>> values) {
 
-        public void setGroupLabels(List<String> groupLabels) {
-                this.groupLabels = groupLabels;
-        }
+    }
 
-        public void setSeriesLabels(List<String> seriesLabels) {
-                this.seriesLabels = seriesLabels;
-        }
+    public void setGroupLabels(List<String> groupLabels) {
+        this.groupLabels = groupLabels;
+    }
 
-        public void setChartValues(List<List<Double>> chartValues) {
-                this.chartValues = chartValues;
-        }
+    public void setSeriesLabels(List<String> seriesLabels) {
+        this.seriesLabels = seriesLabels;
+    }
 
-        public List<List<Double>> getChartValues() {
-                return chartValues;
-        }
+    public void setChartValues(List<List<Double>> chartValues) {
+        this.chartValues = chartValues;
+    }
 
-        public void setPresentation(Presentation presentation) {
-            this.presentation = presentation;
-        }
+    public List<List<Double>> getChartValues() {
+        return chartValues;
+    }
 
-        public Presentation getPresentation() {
-            return presentation;
-        }
+    public void setPresentation(Presentation presentation) {
+        this.presentation = presentation;
+    }
 
+    public Presentation getPresentation() {
+        return presentation;
+    }
 
 }

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

@@ -1 +1 @@
 package uk.ac.cardiff.model.resource;
 
-public class ResourceMetadata {
+import java.io.Serializable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ResourceMetadata implements Serializable{
+    
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(ResourceMetadata.class);
+
+    /** Generated Serial UID */
+    private static final long serialVersionUID = -6007311260031942309L;
 
     /** Identifier for hibernate. */
@@ -14 +26 @@
     /** Whether this resourceId represents a resource external to the organisation. */
     private boolean external;
+    
+    
+    public String getInternalExternal(){        
+        if (internal==true){
+            return "Internal";
+        }
+        else if (external==true){
+            return "External";
+        }
+        return "Unknown";
+    }
+    
+    public void setInternalExternal(String option){
+        if (option.equals("Internal")){
+            internal = true;
+            external = false;            
+        }
+        else if (option.equals("External")){
+            internal = false;
+            external = true;
+        }
+        else{
+            internal = false;
+            external = true;
+        }
+    }
+    
+    public int getResourceCategory() {
+        if (internal==true){
+            return 1;
+        }
+        else if (external==true){
+            return 2;
+        }
+        return 0;
+    }
+    
+    public void setResourceCategory(int resourceCategory){
+        
+    }
+    
+    public String toString(){
+        StringBuilder sb = new StringBuilder();
+        sb.append(this.getClass().getName());
+        sb.append("[");
+        sb.append(persistantId);
+        sb.append(":");
+        sb.append(resourceId);
+        sb.append(":");
+        sb.append(internal);
+        sb.append(":");
+        sb.append(external);
+        sb.append("]");
+        return sb.toString();
+        
+    }
 
     /**
@@ -70 +138 @@
         return persistantId;
     }
+
+
     
     

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

@@ -8 +8 @@
 
 import uk.ac.cardiff.model.ServiceMetadata;
+import uk.ac.cardiff.model.resource.ResourceMetadata;
 
 
@@ -25 +26 @@
     private ServiceMetadata metadata;
     private SuggestionValues suggestionValues;
+    private List<ResourceMetadata> resourceMetadata;
 
     private int numberOfEntries;
@@ -104 +106 @@
     }
 
+    /**
+     * @param resourceMetadata the resourceMetadata to set
+     */
+    public void setResourceMetadata(List<ResourceMetadata> resourceMetadata) {
+        this.resourceMetadata = resourceMetadata;
+    }
+
+    /**
+     * @return the resourceMetadata
+     */
+    public List<ResourceMetadata> getResourceMetadata() {
+        return resourceMetadata;
+    }
+
 
 

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

@@ -52 +52 @@
     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 the view) are kept in sync with the
      * Joda DateTime classes above*/
     private Date startTimeJava;
     private Date endTimeJava;
+    
+    public enum ResourceCategory{
+        /** For resources that are internal to the organisation*/
+        INTERNAL(new int[]{1}), 
+        /** For resources that are external to the organisation*/
+        EXTERNAL(new int[]{2}),
+        /** For all resource categories */
+        ALL(new int[]{1,2});
+        
+        private int[] resourceIdCategory;
+        
+        ResourceCategory(int[] resourceIdCategory){
+            this.resourceIdCategory = resourceIdCategory;
+        }
+
+        /**
+         * @return the resourceIdCategory
+         */
+        public int[] getResourceIdCategory() {
+            return resourceIdCategory;
+        }
+
+        /** 
+         * Returns a <code>String</code> value that represents
+         * an IN SQL operator which specifies the resourceIdCategory(s)
+         * for this <code>ResourceCategory</code> for use in SQL WHERE clauses
+         * 
+         * @return an SQL IN clause
+         */
+        public String getSql() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("in (");
+            for (int i=0; i < resourceIdCategory.length; i++){
+                sb.append(resourceIdCategory[i]);
+                if (i < resourceIdCategory.length-1){
+                    sb.append(",");
+                }
+            }
+            sb.append(")");
+            return sb.toString();
+        }
+    }
+    
+    private ResourceCategory resourceCategory;
 
     /** either system or user types */
@@ -109 +153 @@
      private List<Series> series;
 
+     /** Default constructor. */
      public StatisticParameters(){
          presentation = new Presentation();
@@ -115 +160 @@
          presentation.setyAxisLabel("");
          setSeries(new ArrayList<Series>());
+         resourceCategory = ResourceCategory.ALL;
      }
 
@@ -397 +443 @@
     }
 
-
+    /**
+     * @param resourceCategory the resourceCategory to set
+     */
+    public void setResourceCategory(ResourceCategory resourceCategory) {
+        this.resourceCategory = resourceCategory;
+    }
+
+    /**
+     * @return the resourceCategory
+     */
+    public ResourceCategory getResourceCategory() {
+        return resourceCategory;
+    }
+    
+    public void setResourceCategoryString(String resourceCategory){
+        for (ResourceCategory type : ResourceCategory.values()){
+            if (type.toString().equals(resourceCategory)){
+                this.resourceCategory = type;
+            }
+        }
+    }
+
+    public String getResourceCategoryString(){
+        return resourceCategory.toString();
+    }