Project

General

Profile

« Previous | Next » 

Revision 6471

Added by Matt Jones over 12 years ago

Reverting previous @Overrides chanrge from r6470, as that is the desired
behavior under Java 1.6 -- previous versions of Java (e.g., 1.5) will not
comile with this usage of the @Overrides annotation, but the currently
supported version will. So reverting to the 1.6 convention.

View differences:

MNodeService.java
167 167
   * @throws NotImplemented
168 168
   * @throws InvalidRequest
169 169
   */
170
  //@Override
170
  @Override
171 171
  public Identifier delete(Session session, Identifier pid) 
172 172
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
173 173
    NotImplemented, InvalidRequest {
......
264 264
   * @throws InvalidSystemMetadata
265 265
   * @throws InvalidRequest
266 266
   */
267
  //@Override
267
  @Override
268 268
  public Identifier update(Session session, Identifier pid, InputStream object,
269 269
    Identifier newPid, SystemMetadata sysmeta) 
270 270
    throws InvalidToken, ServiceFailure, NotAuthorized, IdentifierNotUnique, 
......
409 409
   * @throws InsufficientResources
410 410
   * @throws InvalidRequest
411 411
   */
412
  @Override
412 413
  public boolean replicate(Session session, SystemMetadata sysmeta, 
413 414
    NodeReference sourceNode)
414 415
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest,
......
474 475
   * @throws NotImplemented
475 476
   * @throws InvalidRequest
476 477
   */
478
  @Override
477 479
  public DescribeResponse describe(Session session, Identifier pid)
478 480
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
479 481
    NotImplemented, InvalidRequest {
......
539 541
   * @throws InvalidRequest
540 542
   * @throws NotImplemented
541 543
   */
544
  @Override
542 545
  public Checksum getChecksum(Session session, Identifier pid, String algorithm)
543 546
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
544 547
    InvalidRequest, NotImplemented {
......
622 625
   * @throws InvalidRequest
623 626
   * @throws NotImplemented
624 627
   */
628
  @Override
625 629
  public ObjectList listObjects(Session session, Date startTime, Date endTime,
626 630
    ObjectFormatIdentifier objectFormatId, Boolean replicaStatus, Integer start, Integer count)
627 631
    throws NotAuthorized, InvalidRequest, NotImplemented, ServiceFailure,
......
649 653
   * @throws InvalidRequest
650 654
   * @throws NotImplemented
651 655
   */
656
  @Override
652 657
  public Node getCapabilities() throws NotImplemented, NotAuthorized,
653 658
      ServiceFailure, InvalidRequest {
654 659
    
......
823 828
   * @throws InvalidRequest
824 829
   * @throws NotImplemented
825 830
   */
831
  @Override
826 832
  public MonitorList getOperationStatistics(Session session, Date startTime,
827 833
  		Date endTime, Subject requestor, Event event, ObjectFormatIdentifier formatId) 
828 834
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, 
......
875 881
   * @throws InvalidRequest
876 882
   * @throws NotImplemented
877 883
   */
884
  @Override
878 885
  public boolean ping() 
879 886
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, 
880 887
    InsufficientResources, UnsupportedType {
......
914 921
   * @throws InvalidRequest
915 922
   * @throws NotImplemented
916 923
   */
924
  @Override
917 925
  public void synchronizationFailed(Session session, SynchronizationFailed syncFailed)
918 926
      throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest {
919 927

  
......
943 951
  }
944 952

  
945 953
  /**
946
   * Essentially a get() but with different logging behavior and different access control.
954
   * Essentially a get() but with different logging behavior
947 955
   */
956
	@Override
948 957
  public InputStream getReplica(Session session, Identifier pid)
949 958
    throws InvalidRequest, InvalidToken, NotAuthorized, NotImplemented,
950 959
    ServiceFailure, NotFound {

Also available in: Unified diff