Changeset 1316


Ignore:
Timestamp:
12/19/11 16:17:04 (17 months ago)
Author:
philsmart
Message:
 
Location:
raptor-web/trunk/src/main
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java

    r1207 r1316  
    318318 
    319319    /** 
    320      * Sends back to the attached MUA the current resource classification. 
    321      */ 
    322     public void sendResourceClassification() { 
    323         List<ResourceMetadata> resourceMetadata = currentlyAttachedCapabilities.getResourceMetadata(); 
     320     * Sends back to the attached MUA the resource classification <code>resourceMetadata</code>. 
     321     */ 
     322    public void sendResourceClassification(List<ResourceMetadata> resourceMetadata) { 
    324323        serviceEndpointClient.sendResourceMetadata(resourceMetadata, attachedMUA); 
    325324 

  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/SetupService.java

    r899 r1316  
    2323import uk.ac.cardiff.model.wsmodel.Capabilities; 
    2424import uk.ac.cardiff.raptorweb.model.MUAEntry; 
    25 import uk.ac.cardiff.raptorweb.model.SetupModel; 
    2625import uk.ac.cardiff.raptorweb.model.WebSession; 
    2726 
    2827/** 
    2928 * @author philsmart 
    30  * 
     29 *  
    3130 */ 
    3231public interface SetupService { 
    3332 
    34         public List getStatisticalServices(); 
     33    public List getStatisticalServices(); 
    3534 
    36         public void setAttachedEndpoint(WebSession websession); 
     35    public void setAttachedEndpoint(WebSession websession); 
    3736 
    38         /** 
    39          * performs the operation in place on the SetupModel 
    40          * @param model 
    41          */ 
    42         public void getCapabilities(WebSession websession); 
     37    /** 
     38     * performs the operation in place on the SetupModel 
     39     *  
     40     * @param model 
     41     */ 
     42    public void getCapabilities(WebSession websession); 
    4343 
    44         public void deleteAllEntriesFromAttachedMUA(WebSession websession); 
     44    public void deleteAllEntriesFromAttachedMUA(WebSession websession); 
    4545 
    46         /** 
    47          * Check if there is at least one attached MUA 
    48          * @return 
    49          */ 
    50         public boolean getHasAttached(); 
     46    /** 
     47     * Check if there is at least one attached MUA 
     48     *  
     49     * @return 
     50     */ 
     51    public boolean getHasAttached(); 
    5152 
    52         public Capabilities getAttachedCapabilities(); 
     53    public Capabilities getAttachedCapabilities(); 
    5354 
    54         public MUAEntry getCurrentlyAttached(); 
    55          
    56                
    57         /** 
    58          * Upload all files currently stored in <code>websession.setupmodel.fileUpload</code> class. 
    59          *  
    60          * @param websession 
    61          */ 
    62         public void batchUpload(WebSession websession); 
    63          
    64         public void sendResourceClassification(); 
     55    public MUAEntry getCurrentlyAttached(); 
     56 
     57    /** 
     58     * Upload all files currently stored in <code>websession.setupmodel.fileUpload</code> class. 
     59     *  
     60     * @param websession 
     61     */ 
     62    public void batchUpload(WebSession websession); 
     63 
     64    /** 
     65     * Sends the resource classification list embedded in the <code>websession</code> to the MUA for storage. 
     66     *  
     67     * @param websession 
     68     *            the {@link WebSession} that holds the resource metadata classification. 
     69     */ 
     70    public void sendResourceClassification(WebSession websession); 
    6571 
    6672} 

  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/SetupServiceImpl.java

    r1207 r1316  
    8585    } 
    8686 
    87     public void sendResourceClassification() { 
    88         webEngine.sendResourceClassification(); 
     87    public void sendResourceClassification(WebSession websession) { 
     88        webEngine.sendResourceClassification(websession.getSetupmodel().getSelectEndpointCapabilities().getResourceMetadata()); 
    8989    } 
    9090 

  • raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/main-flow.xml

    r1207 r1316  
    155155 
    156156        <transition on="sendResourceClassification"> 
    157             <evaluate expression="setupService.sendResourceClassification()" /> 
     157            <evaluate expression="setupService.sendResourceClassification(flowScope.websession)" /> 
    158158        </transition> 
    159159 

  • raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/setupRaptorWeb.xhtml

    r1311 r1316  
    135135                                        <h:form id="resourceClassificationForm"> 
    136136                                                <rich:scrollableDataTable 
    137                                                         value="#{setupService.attachedCapabilities.resourceMetadata}" 
     137                                                        value="#{flowScope.websession.setupmodel.selectEndpointCapabilities.resourceMetadata}" 
    138138                                                        bandingInterval="2" height="400px" banding="row" var="resource" 
    139139                                                        width="570px"> 
Note: See TracChangeset for help on using the changeset viewer.