diff --git a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java index 7c8855d..1b9703c 100644 --- a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java +++ b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java @@ -913,6 +913,7 @@ } private boolean hasMatchAnnotation(ASTNode node, List modifiers, String annotationName, String... values) { + for (var annotation : modifiers) { // annotation���A�m�e�[�V��������Ȃ���,���̃��[�v�� if (!(annotation instanceof Annotation)) @@ -927,8 +928,10 @@ // annotation���l��1�‚̃A�m�e�[�V�����������ꍇ if (annotation instanceof SingleMemberAnnotation) { + //�����Œl�̎w�肪���ɂ���Ă��Ȃ��Ƃ��̓A�m�e�[�V����������v�����i�K��true��Ԃ� if (values.length == 0) return true; + SingleMemberAnnotation singleMemberAnnotation = (SingleMemberAnnotation) annotation; Expression tmp = singleMemberAnnotation.getValue(); @@ -936,10 +939,17 @@ String typename = itype.getTypeQualifiedName(); if (tmp instanceof ArrayInitializer) { + String value = singleMemberAnnotation.getValue().toString().substring(1, + singleMemberAnnotation.getValue().toString().length() - 1); + String[] arr = value.split(","); + for(int i=0; i