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:

CNodeService.java
119 119
   * @throws InvalidRequest
120 120
   * 
121 121
   */
122
  @Override
122 123
  public boolean setReplicationPolicy(Session session, Identifier pid,
123 124
    ReplicationPolicy policy) 
124 125
    throws NotImplemented, NotFound, NotAuthorized, ServiceFailure, InvalidRequest, InvalidToken {
......
174 175
   * @throws NotFound
175 176
   * 
176 177
   */
178
  @Override
177 179
  public boolean setReplicationStatus(Session session, Identifier pid,
178 180
    NodeReference targetNode, ReplicationStatus status) 
179 181
    throws ServiceFailure, NotImplemented, InvalidToken, NotAuthorized, 
......
235 237
   * @throws InvalidRequest
236 238
   * @throws NotImplemented
237 239
   */
240
  @Override
238 241
  public boolean assertRelation(Session session, Identifier pidOfSubject, 
239 242
    String relationship, Identifier pidOfObject) 
240 243
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
......
299 302
   * @throws InvalidRequest
300 303
   * @throws NotImplemented
301 304
   */
305
  @Override
302 306
  public Checksum getChecksum(Session session, Identifier pid)
303 307
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
304 308
    InvalidRequest, NotImplemented {
......
332 336
   * @throws NotFound
333 337
   * @throws NotImplemented
334 338
   */
339
  @Override
335 340
  public ObjectLocationList resolve(Session session, Identifier pid)
336 341
    throws InvalidRequest, InvalidToken, ServiceFailure, NotAuthorized,
337 342
    NotFound, NotImplemented {
......
357 362
   * @throws InvalidRequest
358 363
   * @throws NotImplemented
359 364
   */
365
  @Override
360 366
  public ObjectList search(Session session, String queryType, String query)
361 367
    throws InvalidToken, ServiceFailure, NotAuthorized, InvalidRequest,
362 368
    NotImplemented {
......
444 450
   * @throws InsufficientResources
445 451
   * @throws NotImplemented
446 452
   */
453
  @Override
447 454
  public ObjectFormat getFormat(ObjectFormatIdentifier fmtid)
448 455
    throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources,
449 456
    NotImplemented {
......
465 472
   * @throws NotFound
466 473
   * @throws InsufficientResources
467 474
   */
475
  @Override
468 476
  public ObjectFormatList listFormats() 
469 477
    throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources, 
470 478
    NotImplemented {
......
480 488
   * @throws ServiceFailure
481 489
   * @throws NotImplemented
482 490
   */
491
  @Override
483 492
  public NodeList listNodes() 
484 493
    throws NotImplemented, ServiceFailure {
485 494

  
......
502 511
   * @throws InvalidRequest
503 512
   * @throws InvalidSystemMetadata
504 513
   */
514
  @Override
505 515
  public Identifier registerSystemMetadata(Session session, Identifier guid,
506 516
    SystemMetadata sysmeta) 
507 517
    throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest, 
......
567 577
   * @throws InvalidSystemMetadata
568 578
   * @throws NotFound
569 579
   */
580
  @Override
570 581
  public boolean updateSystemMetadata(Session session, Identifier guid,
571 582
    SystemMetadata sysmeta) 
572 583
    throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest, 
......
642 653
   * @throws IdentifierNotUnique
643 654
   * @throws NotImplemented
644 655
   */
656
  @Override
645 657
  public boolean reserveIdentifier(Session session, Identifier pid)
646 658
  throws InvalidToken, ServiceFailure,
647 659
        NotAuthorized, IdentifierNotUnique, NotImplemented, InvalidRequest {
......
649 661
    throw new NotImplemented("4191", "reserveIdentifier not implemented on this node");
650 662
  }
651 663
  
664
  @Override
652 665
  public Identifier generateIdentifier(Session session, String scheme, String fragment)
653 666
  throws InvalidToken, ServiceFailure,
654 667
        NotAuthorized, NotImplemented, InvalidRequest {
......
672 685
   * @throws NotImplemented
673 686
   */
674 687

  
688
  @Override
675 689
  public boolean hasReservation(Session session, Identifier pid) 
676 690
      throws InvalidToken, ServiceFailure, NotFound, NotAuthorized, IdentifierNotUnique, 
677 691
      NotImplemented, InvalidRequest {
......
696 710
   * @throws NotImplemented
697 711
   * @throws InvalidRequest
698 712
   */  
713
  @Override
699 714
  public Identifier setOwner(Session session, Identifier pid, Subject userId)
700 715
    throws InvalidToken, ServiceFailure, NotFound, NotAuthorized,
701 716
    NotImplemented, InvalidRequest {
......
752 767
   * @throws InvalidRequest
753 768
   * @throws NotFound
754 769
   */
770
  @Override
755 771
  public boolean isNodeAuthorized(Session originatingNodeSession, 
756 772
    Subject targetNodeSubject, Identifier pid, Permission replicatePermission) 
757 773
    throws NotImplemented, NotAuthorized, InvalidToken, ServiceFailure, 

Also available in: Unified diff