Index: Access.java =================================================================== --- Access.java (revision 4925) +++ Access.java (working copy) @@ -675,7 +675,8 @@ Iterator denyIt = accessDenyList.iterator(); Object nextStepMapObj = null; OrderedMap nextStepMap = null; - int accessPredicate = 1; + int allowPredicate = 1; + int denyPredicate = 1; accessList.removeAllRows(); boolean accessAllowRetVal = true; @@ -688,16 +689,20 @@ continue; } nextStepMap = (OrderedMap) nextStepMapObj; - if (nextStepMap.isEmpty() || nextStepMap == publicMap) { + if (nextStepMap.isEmpty()) { continue; } + if (nextStepMap == publicMap) { + allowPredicate++; + continue; + } WizardPageLibrary library = new WizardPageLibrary(null); AccessPage nextStep = (AccessPage) library.getPage( DataPackageWizardInterface.ACCESS_PAGE); boolean checkAccess = nextStep.setPageData(nextStepMap, this.xPathRoot + "allow[" + - + (accessPredicate++) + "]"); + + (allowPredicate++) + "]"); if (!checkAccess) { accessAllowRetVal = false; @@ -718,17 +723,20 @@ continue; } nextStepMap = (OrderedMap) nextStepMapObj; - if (nextStepMap.isEmpty() || nextStepMap == publicMap) { + if (nextStepMap.isEmpty()) { continue; } - + if (nextStepMap == publicMap) { + denyPredicate++; + continue; + } WizardPageLibrary library = new WizardPageLibrary(null); AccessPage nextStep = (AccessPage) library.getPage( DataPackageWizardInterface.ACCESS_PAGE); boolean checkAccess = nextStep.setPageData(nextStepMap, this.xPathRoot + "deny[" + - + (accessPredicate++) + "]/"); + + (denyPredicate++) + "]"); if (!checkAccess) { accessDenyRetVal = false;