diff --git a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java index bed88d2..473e9fa 100644 --- a/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java +++ b/src/org/ntlab/pushPullRefactoring/PushPullProcessor.java @@ -225,6 +225,8 @@ deletePutMethodInvocation(srcUnitRewrite, srcUnit, dstValue); // @PushReference���t�^���ꂽ�t�B�[���h���폜 deleteASTNode(srcUnitRewrite, srcUnit, searchFieldDeclaration(descriptor.getSourceClass(), "PushReference", dstValue)); + + System.out.println(); try { applyRewrite(srcUnit, srcUnitRewrite, pm); applyRewrite(dstUnit, dstUnitRewrite, pm); @@ -233,19 +235,7 @@ // TODO Auto-generated catch block e1.printStackTrace(); } -// // �V�K�t�@�C���쐬 -// try { -// IPath dstPath = dstUnit.getJavaElement().getPath(); -// ITextFileBufferManager dstBufferManager = FileBuffers.getTextFileBufferManager(); -// dstBufferManager.connect(dstPath, LocationKind.IFILE, pm); -// ITextFileBuffer dstTextFileBuffer = dstBufferManager.getTextFileBuffer(dstPath, LocationKind.IFILE); -// IDocument dstDocument = dstTextFileBuffer.getDocument(); -// TextEdit dstEdit = dstUnitRewrite.rewriteAST(dstDocument, null); -// UndoEdit dstUndo = dstEdit.apply(dstDocument); -// dstTextFileBuffer.commit(pm /* ProgressMonitor */, true/* Overwrite */); -// } catch (Exception e) { -// e.printStackTrace(); -// } + } private void applyRewrite(CompilationUnit unit, ASTRewrite unitRewrite, IProgressMonitor pm) throws Exception { IPath path = unit.getJavaElement().getPath(); @@ -324,7 +314,7 @@ } - private MethodDeclaration[] searchMethodDeclarations(CompilationUnit cu, String annotationName, String... values) { + public MethodDeclaration[] searchMethodDeclarations(CompilationUnit cu, String annotationName, String... values) { List result = new ArrayList(); cu.accept(new ASTVisitor() { @Override @@ -359,6 +349,11 @@ return result; } + /** + * Map.Entry��Map�ɕϊ����郁�\�b�h + * @param type + * @return + */ private String convertType(Type type) { if ((type instanceof ParameterizedType