Project

General

Profile

Bug #5058 ยป Access.java.patch

Jim Regetz, 06/25/2010 11:58 AM

View differences:

Access.java (working copy)
675 675
    Iterator denyIt = accessDenyList.iterator();
676 676
    Object nextStepMapObj = null;
677 677
    OrderedMap nextStepMap = null;
678
    int accessPredicate = 1;
678
    int allowPredicate = 1;
679
    int denyPredicate = 1;
679 680

  
680 681
    accessList.removeAllRows();
681 682
    boolean accessAllowRetVal = true;
......
688 689
        continue;
689 690
      }
690 691
      nextStepMap = (OrderedMap) nextStepMapObj;
691
      if (nextStepMap.isEmpty() || nextStepMap == publicMap) {
692
      if (nextStepMap.isEmpty()) {
692 693
        continue;
693 694
      }
695
      if (nextStepMap == publicMap) {
696
        allowPredicate++;
697
        continue;
698
      }
694 699
      WizardPageLibrary library = new WizardPageLibrary(null);
695 700
      AccessPage nextStep = (AccessPage) library.getPage(
696 701
          DataPackageWizardInterface.ACCESS_PAGE);
697 702

  
698 703
      boolean checkAccess = nextStep.setPageData(nextStepMap,
699 704
          this.xPathRoot + "allow[" +
700
          + (accessPredicate++) + "]");
705
          + (allowPredicate++) + "]");
701 706

  
702 707
      if (!checkAccess) {
703 708
        accessAllowRetVal = false;
......
718 723
        continue;
719 724
      }
720 725
      nextStepMap = (OrderedMap) nextStepMapObj;
721
      if (nextStepMap.isEmpty() || nextStepMap == publicMap) {
726
      if (nextStepMap.isEmpty()) {
722 727
        continue;
723 728
      }
724

  
729
      if (nextStepMap == publicMap) {
730
        denyPredicate++;
731
        continue;
732
      }
725 733
      WizardPageLibrary library = new WizardPageLibrary(null);
726 734
      AccessPage nextStep = (AccessPage) library.getPage(
727 735
          DataPackageWizardInterface.ACCESS_PAGE);
728 736

  
729 737
      boolean checkAccess = nextStep.setPageData(nextStepMap,
730 738
          this.xPathRoot + "deny[" +
731
          + (accessPredicate++) + "]/");
739
          + (denyPredicate++) + "]");
732 740

  
733 741
      if (!checkAccess) {
734 742
        accessDenyRetVal = false;
    (1-1/1)