Changeset 747


Ignore:
Timestamp:
05/05/11 18:59:49 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model
Files:
1 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/Capabilities.java

    r743 r747  
    55 
    66import java.io.Serializable; 
    7 import java.util.ArrayList; 
    87import java.util.List; 
    98 
    10 import uk.ac.cardiff.model.ClientMetadata; 
    11 import uk.ac.cardiff.model.ServerMetadata; 
    12 import uk.ac.cardiff.model.wsmodel.StatisticParameters.StatisticType; 
     9import uk.ac.cardiff.model.ServiceMetadata; 
     10 
    1311 
    1412/** 
    1513 * @author philsmart 
    16  *  
     14 * 
    1715 */ 
    1816public class Capabilities implements Serializable { 
     
    2523    private String errorMessage; 
    2624    private boolean error; 
    27     private ServerMetadata metadata; 
     25    private ServiceMetadata metadata; 
    2826    private SuggestionValues suggestionValues; 
    2927 
     
    3634    /** 
    3735     * Returns all configured statistical units 
    38      *  
     36     * 
    3937     * @return 
    4038     */ 
     
    8987    } 
    9088 
    91     public void setMetadata(ServerMetadata metadata) { 
     89    public void setMetadata(ServiceMetadata metadata) { 
    9290        this.metadata = metadata; 
    9391    } 
    9492 
    95     public ServerMetadata getMetadata() { 
     93    public ServiceMetadata getMetadata() { 
    9694        return metadata; 
    9795    } 
     
    9997    public void setNumberOfAuthenticationsStored(int numberOfEntries) { 
    10098        this.numberOfEntries = numberOfEntries; 
    101          
     99 
    102100    } 
    103      
     101 
    104102    public int getNumberOfAuthenticationsStored(){ 
    105103        return numberOfEntries; 
    106104    } 
    107      
    108   
    109         
     105 
     106 
     107 
    110108 
    111109} 
  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/EventPushMessage.java

    r614 r747  
    66import java.util.Date; 
    77import java.util.List; 
    8 import java.util.Set; 
    98 
    10 import uk.ac.cardiff.model.ClientMetadata; 
     9import uk.ac.cardiff.model.ServiceMetadata; 
    1110import uk.ac.cardiff.model.event.Event; 
    1211 
     
    1918 
    2019    private List<Event> events; 
    21     private ClientMetadata clientMetadata; 
     20    private ServiceMetadata clientMetadata; 
    2221    private Date timeOfPush; 
    2322 
     
    3433        return timeOfPush; 
    3534    } 
    36     public void setClientMetadata(ClientMetadata clientMetadata) { 
     35    public void setClientMetadata(ServiceMetadata clientMetadata) { 
    3736        this.clientMetadata = clientMetadata; 
    3837    } 
    39     public ClientMetadata getClientMetadata() { 
     38    public ServiceMetadata getClientMetadata() { 
    4039        return clientMetadata; 
    4140    } 
Note: See TracChangeset for help on using the changeset viewer.