diff --git a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java index 9591284..533c1d3 100644 --- a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java +++ b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java @@ -209,7 +209,7 @@ * @param value �A�m�e�[�V�����̒l * @return �A�m�e�[�V�������t�^���ꂽ�t�B�[���h�̐錾�� */ - private FieldDeclaration searchFieldDeclaration(CompilationUnit cu, String annotationName,String... value) { + private FieldDeclaration searchFieldDeclaration(CompilationUnit cu, String annotationName, String... value) { FieldDeclaration[] result = new FieldDeclaration[1]; cu.accept(new ASTVisitor() { @@ -223,17 +223,21 @@ if(annotationName.equals(annoName)) { //annotation���l�̖����A�m�e�[�V�����������ꍇ - if(annotation instanceof SingleMemberAnnotation) { - result[0] = node; - } - - //annotation���l��1�‚̃A�m�e�[�V�����������ꍇ if(annotation instanceof MarkerAnnotation) { + result[0] = node; } + + //annotation���l��1�‚̃A�m�e�[�V�����������ꍇ + if(annotation instanceof SingleMemberAnnotation) { + var singleMemberAnnotation = ( SingleMemberAnnotation)annotation; + if(singleMemberAnnotation.getValue().equals(value[0]))result[0] = node; + } //annotation���l�𕡐����ƒA�m�e�[�V�����������ꍇ if(annotation instanceof NormalAnnotation) { - + NormalAnnotation normalAnnotation = (NormalAnnotation)annotation; + + // if(normalAnnotation.values())result[0] = node; } } @@ -244,6 +248,11 @@ }); return result[0]; } + //2�‚̃��X�g�����—v�f�����������ǂ����𔻒肷�郁�\�b�h + private boolean isEqualSets(List a, List b) { + + return false; + } /** * AST�𕶎���̃R�[�h�ɖ߂����\�b�h *