/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for, or <code>null</code> for default visibility * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final ModifierKeyword threshold, final Map<IMember, IncomingMemberVisibilityAdjustment> adjustments) { Assert.isNotNull(member); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= adjustments.get(member); if (adjustment != null) return hasLowerVisibility(adjustment.getKeyword(), threshold); return true; }
/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for, or <code>null</code> for default visibility * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final ModifierKeyword threshold, final Map adjustments) { Assert.isNotNull(member); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= (IncomingMemberVisibilityAdjustment) adjustments.get(member); if (adjustment != null) return hasLowerVisibility(adjustment.getKeyword(), threshold); return true; }
/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for, or <code>null</code> for default visibility * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final ModifierKeyword threshold, final Map<IMember, IncomingMemberVisibilityAdjustment> adjustments) { Assert.isNotNull(member); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= adjustments.get(member); if (adjustment != null) return hasLowerVisibility(adjustment.getKeyword(), threshold); return true; }
ModifierKeyword kw= adjustment != null ? adjustment.getKeyword() : ModifierKeyword.fromFlagValue(JdtFlags.getVisibilityCode(member)); if (MemberVisibilityAdjustor.hasLowerVisibility(kw, threshold)) { adjustments.put(member, new MemberVisibilityAdjustor.IncomingMemberVisibilityAdjustment(member, threshold, RefactoringStatus.createWarningStatus(Messages.format(MemberVisibilityAdjustor.getMessage(member), new String[] { MemberVisibilityAdjustor.getLabel(member), MemberVisibilityAdjustor.getLabel(threshold)}), JavaStatusContext.create(member))));
ModifierKeyword kw= (adjustment != null) ? adjustment.getKeyword() : ModifierKeyword.fromFlagValue(JdtFlags.getVisibilityCode(member)); if (MemberVisibilityAdjustor.hasLowerVisibility(kw, threshold)) { adjustments.put(member, new MemberVisibilityAdjustor.IncomingMemberVisibilityAdjustment(member, threshold, RefactoringStatus.createWarningStatus(Messages.format(MemberVisibilityAdjustor.getMessage(member), new String[] { MemberVisibilityAdjustor.getLabel(member), MemberVisibilityAdjustor.getLabel(threshold)}), JavaStatusContext.create(member))));
ModifierKeyword kw= adjustment != null ? adjustment.getKeyword() : ModifierKeyword.fromFlagValue(JdtFlags.getVisibilityCode(member)); if (MemberVisibilityAdjustor.hasLowerVisibility(kw, threshold)) { adjustments.put(member, new MemberVisibilityAdjustor.IncomingMemberVisibilityAdjustment(member, threshold, RefactoringStatus.createWarningStatus(Messages.format(MemberVisibilityAdjustor.getMessage(member), new String[] { MemberVisibilityAdjustor.getLabel(member), MemberVisibilityAdjustor.getLabel(threshold)}), JavaStatusContext.create(member))));
@Override public void rewriteVisibility(final MemberVisibilityAdjustor adjustor, final IProgressMonitor monitor) throws JavaModelException { Assert.isNotNull(adjustor); Assert.isNotNull(monitor); try { monitor.beginTask("", 1); //$NON-NLS-1$ monitor.setTaskName(RefactoringCoreMessages.MemberVisibilityAdjustor_adjusting); if (fNeedsRewriting) { if (adjustor.fRewrite != null && adjustor.fRoot != null) rewriteVisibility(adjustor, adjustor.fRewrite, adjustor.fRoot, null, fRefactoringStatus); else { final CompilationUnitRewrite rewrite= adjustor.getCompilationUnitRewrite(fMember.getCompilationUnit()); rewriteVisibility(adjustor, rewrite.getASTRewrite(), rewrite.getRoot(), rewrite.createCategorizedGroupDescription(Messages.format(RefactoringCoreMessages.MemberVisibilityAdjustor_change_visibility, getLabel(getKeyword())), SET_VISIBILITY_ADJUSTMENTS), fRefactoringStatus); } } else if (fRefactoringStatus != null) adjustor.fStatus.merge(fRefactoringStatus); monitor.worked(1); } finally { monitor.done(); } }
public void rewriteVisibility(final MemberVisibilityAdjustor adjustor, final IProgressMonitor monitor) throws JavaModelException { Assert.isNotNull(adjustor); Assert.isNotNull(monitor); try { monitor.beginTask("", 1); //$NON-NLS-1$ monitor.setTaskName(RefactoringCoreMessages.MemberVisibilityAdjustor_adjusting); if (fNeedsRewriting) { if (adjustor.fRewrite != null && adjustor.fRoot != null) rewriteVisibility(adjustor, adjustor.fRewrite, adjustor.fRoot, null, fRefactoringStatus); else { final CompilationUnitRewrite rewrite= adjustor.getCompilationUnitRewrite(fMember.getCompilationUnit()); rewriteVisibility(adjustor, rewrite.getASTRewrite(), rewrite.getRoot(), rewrite.createCategorizedGroupDescription(Messages.format(RefactoringCoreMessages.MemberVisibilityAdjustor_change_visibility, getLabel(getKeyword())), SET_VISIBILITY_ADJUSTMENTS), fRefactoringStatus); } } else if (fRefactoringStatus != null) adjustor.fStatus.merge(fRefactoringStatus); monitor.worked(1); } finally { monitor.done(); } }
/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final int threshold, final Map adjustments) { Assert.isNotNull(member); Assert.isTrue(isVisibilityModifier(threshold)); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= (IncomingMemberVisibilityAdjustment) adjustments.get(member); if (adjustment != null) { final ModifierKeyword keyword= adjustment.getKeyword(); return hasLowerVisibility(keyword == null ? Modifier.NONE : keyword.toFlagValue(), threshold); } return true; }
@Override public void rewriteVisibility(final MemberVisibilityAdjustor adjustor, final IProgressMonitor monitor) throws JavaModelException { Assert.isNotNull(adjustor); Assert.isNotNull(monitor); try { monitor.beginTask("", 1); //$NON-NLS-1$ monitor.setTaskName(RefactoringCoreMessages.MemberVisibilityAdjustor_adjusting); if (fNeedsRewriting) { if (adjustor.fRewrite != null && adjustor.fRoot != null) rewriteVisibility(adjustor, adjustor.fRewrite, adjustor.fRoot, null, fRefactoringStatus); else { final CompilationUnitRewrite rewrite= adjustor.getCompilationUnitRewrite(fMember.getCompilationUnit()); rewriteVisibility(adjustor, rewrite.getASTRewrite(), rewrite.getRoot(), rewrite.createCategorizedGroupDescription(Messages.format(RefactoringCoreMessages.MemberVisibilityAdjustor_change_visibility, getLabel(getKeyword())), SET_VISIBILITY_ADJUSTMENTS), fRefactoringStatus); } } else if (fRefactoringStatus != null) adjustor.fStatus.merge(fRefactoringStatus); monitor.worked(1); } finally { monitor.done(); } }
/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final int threshold, final Map<IMember, IncomingMemberVisibilityAdjustment> adjustments) { Assert.isNotNull(member); Assert.isTrue(isVisibilityModifier(threshold)); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= adjustments.get(member); if (adjustment != null) { final ModifierKeyword keyword= adjustment.getKeyword(); return hasLowerVisibility(keyword == null ? Modifier.NONE : keyword.toFlagValue(), threshold); } return true; }
/** * Does the specified member need further visibility adjustment? * * @param member the member to test * @param threshold the visibility threshold to test for * @param adjustments the map of members to visibility adjustments * @return <code>true</code> if the member needs further adjustment, <code>false</code> otherwise */ public static boolean needsVisibilityAdjustments(final IMember member, final int threshold, final Map<IMember, IncomingMemberVisibilityAdjustment> adjustments) { Assert.isNotNull(member); Assert.isTrue(isVisibilityModifier(threshold)); Assert.isNotNull(adjustments); final IncomingMemberVisibilityAdjustment adjustment= adjustments.get(member); if (adjustment != null) { final ModifierKeyword keyword= adjustment.getKeyword(); return hasLowerVisibility(keyword == null ? Modifier.NONE : keyword.toFlagValue(), threshold); } return true; }