Changeset 739


Ignore:
Timestamp:
05/04/11 18:10:57 (8 years ago)
Author:
philsmart
Message:
 
Location:
raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model
Files:
3 edited

Legend:

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

    r711 r739  
    5353                        the object during save or update of this object 
    5454                --> 
    55                 <many-to-one name="principalInformation" 
     55                <!--<many-to-one name="principalInformation" 
    5656                        class="uk.ac.cardiff.model.event.auxiliary.PrincipalInformation" 
    5757                        column="principalInformation_id" cascade="all" /> 
     
    6161 
    6262 
     63 
     64        --> 
     65        <component name="principalInformation"> 
     66            <property name="school" type="string" update="true" insert="true" 
     67            column="school" index="school_index" /> 
     68            <property name="affiliation" type="string" update="true" 
     69            insert="true" column="affiliation" index="affiliation_index" /> 
     70        </component> 
    6371 
    6472        </subclass> 
     
    95103        </subclass> 
    96104 
    97         <class name="uk.ac.cardiff.model.event.auxiliary.PrincipalInformation" 
     105        <!--<class name="uk.ac.cardiff.model.event.auxiliary.PrincipalInformation" 
    98106                table="principalInformation"> 
    99107 
     
    112120 
    113121 
    114 </hibernate-mapping> 
     122--></hibernate-mapping> 
  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/StatisticParameters.java

    r696 r739  
    66import java.io.Serializable; 
    77import java.util.ArrayList; 
     8import java.util.Arrays; 
    89import java.util.Calendar; 
    910import java.util.Date; 
     
    7172    /** The type of statistic */ 
    7273    private StatisticType type; 
    73      
     74 
    7475    //TODO should be constructed in XML 
    7576    /** The type of event from the information model this statistic should be performed over*/ 
     
    7980        /** An Ezproxy Authentication Event Type */ 
    8081        EZPROXY_AUTHENTICATION("EzproxyAuthenticationEvent"); 
    81          
     82 
    8283        private String hibernateSimpleClassName; 
    83          
     84 
    8485        private EventType(String hibernateSimpleClassName){ 
    8586            this.hibernateSimpleClassName = hibernateSimpleClassName; 
    8687        } 
    87          
     88 
    8889        public String getHibernateSimpleClassName(){ 
    8990            return hibernateSimpleClassName; 
    9091        } 
    9192    } 
    92      
     93 
     94    /** The type of event this statistic is computed for */ 
    9395    private EventType eventType; 
    9496 
     
    136138 
    137139    public DateTime getStartTimeAsDate() { 
    138         log.debug("Returning start time as {}",startTime); 
    139140        return startTime; 
    140141    } 
     
    373374    } 
    374375 
     376    public void setEventTypeString(String eventType) { 
     377        for (EventType type : EventType.values()){ 
     378            if (type.toString().equals(eventType)){ 
     379                this.eventType = type; 
     380            } 
     381        } 
     382    } 
     383 
     384    public String getEventTypeString(){ 
     385        return eventType.toString(); 
     386    } 
     387 
    375388    public EventType getEventType() { 
    376389        return eventType; 
     
    380393 
    381394 
     395 
     396 
    382397} 
  • raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/wsmodel/SuggestionValues.java

    r563 r739  
    99 
    1010public class SuggestionValues implements Serializable{ 
    11      
     11 
    1212    /** 
    1313     * default serial UId 
     
    1515    private static final long serialVersionUID = 7312337340123235532L; 
    1616 
    17     static Logger log = LoggerFactory.getLogger(SuggestionValues.class); 
    18      
     17    private final Logger log = LoggerFactory.getLogger(SuggestionValues.class); 
     18 
    1919    private List<String> possibleFieldNameValues; 
    20      
     20 
    2121 
    2222    public void setPossibleFieldNameValues(List<String> possibleFieldNameValues) { 
Note: See TracChangeset for help on using the changeset viewer.