Small refactoring

taksan · May 3, 2012 · af8c86d · af8c86d
1 parent 638dcd7
commit af8c86d
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 74 deletions.
diff --git a/plugin/src/editor/utils/EditorUtils.java b/plugin/src/editor/utils/EditorUtils.java
@@ -0,0 +1,83 @@
+package editor.utils;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+public class EditorUtils {
+
+	public static void goToClassMethod(String classMethod) {
+		IJavaProject project = getActiveJavaProject();
+
+        String className = classMethod.replaceAll("(.*)\\.[^.]+(\\(\\))?$", "$1");
+        String methodName = classMethod.replaceAll(".*\\.([^.]*(\\(\\))?$)", "$1");
+        try {
+			IType iType = project.findType(className);
+			IMethod method = iType.getMethod(methodName, new String[0]);
+			ISourceRange sourceRange = method.getSourceRange();
+
+			IWorkbenchPage activePage= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+
+			ITextEditor openEditor = (ITextEditor) IDE.openEditor(activePage, (IFile) iType.getResource(), true);
+			openEditor.selectAndReveal(sourceRange.getOffset(), 1);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static IJavaProject getActiveJavaProject() {
+		IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+		IFileEditorInput input = (IFileEditorInput)activeEditor.getEditorInput() ;
+        IFile file = input.getFile();
+        IProject activeProject = file.getProject();
+
+        IJavaModel javaModel= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
+        IJavaProject project = (IJavaProject) javaModel.getJavaProject(activeProject.getName());
+		return project;
+	}
+
+	public static void goToLineInCurrentFile(int lineNumber) {
+		IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+		goToLine(activeEditor, lineNumber);
+	}
+
+	public static void goToLine(IEditorPart editorPart, int lineNumber) {
+		if (!(editorPart instanceof ITextEditor) || lineNumber <= 0) {
+			return;
+		}
+		ITextEditor editor = (ITextEditor) editorPart;
+		IDocument document = editor.getDocumentProvider().getDocument(
+				editor.getEditorInput());
+		if (document != null) {
+			IRegion lineInfo = null;
+			try {
+				// line count internaly starts with 0, and not with 1 like in
+				// GUI
+				lineInfo = document.getLineInformation(lineNumber - 1);
+			} catch (BadLocationException e) {
+				// ignored because line number may not really exist in document,
+				// we guess this...
+			}
+			if (lineInfo != null) {
+				editor.selectAndReveal(lineInfo.getOffset(),
+						lineInfo.getLength());
+			}
+		}
+	}
+
+}
diff --git a/plugin/src/objective/ng/GotoMethodServer.java b/plugin/src/objective/ng/GotoMethodServer.java
@@ -6,26 +6,9 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
+
+import editor.utils.EditorUtils;
 
 public class GotoMethodServer {
 
@@ -63,62 +46,8 @@ protected void processMessage(final String message) {
 		Display.getDefault().asyncExec(new Runnable() {
 		    @Override
 		    public void run() {
-		    	goToClassMethod(message);
+		    	EditorUtils.goToClassMethod(message);
 		    }
 		});
 	}
-
-	private void goToClassMethod(String classMethod) {
-		IJavaProject project = getActiveJavaProject();
-
-        String className = classMethod.replaceAll("(.*)\\.[^.]+(\\(\\))?$", "$1");
-        String methodName = classMethod.replaceAll(".*\\.([^.]*(\\(\\))?$)", "$1");
-        try {
-			IType iType = project.findType(className);
-			IMethod method = iType.getMethod(methodName, new String[0]);
-			ISourceRange sourceRange = method.getSourceRange();
-
-			IWorkbenchPage activePage= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
-			ITextEditor openEditor = (ITextEditor) IDE.openEditor(activePage, (IFile) iType.getResource(), true);
-			openEditor.selectAndReveal(sourceRange.getOffset(), 1);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private IJavaProject getActiveJavaProject() {
-		IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		IFileEditorInput input = (IFileEditorInput)activeEditor.getEditorInput() ;
-        IFile file = input.getFile();
-        IProject activeProject = file.getProject();
-
-        IJavaModel javaModel= JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-        IJavaProject project = (IJavaProject) javaModel.getJavaProject(activeProject.getName());
-		return project;
-	}
-
-	private static void goToLine(IEditorPart editorPart, int lineNumber) {
-		if (!(editorPart instanceof ITextEditor) || lineNumber <= 0) {
-			return;
-		}
-		ITextEditor editor = (ITextEditor) editorPart;
-		IDocument document = editor.getDocumentProvider().getDocument(
-				editor.getEditorInput());
-		if (document != null) {
-			IRegion lineInfo = null;
-			try {
-				// line count internaly starts with 0, and not with 1 like in
-				// GUI
-				lineInfo = document.getLineInformation(lineNumber - 1);
-			} catch (BadLocationException e) {
-				// ignored because line number may not really exist in document,
-				// we guess this...
-			}
-			if (lineInfo != null) {
-				editor.selectAndReveal(lineInfo.getOffset(),
-						lineInfo.getLength());
-			}
-		}
-	}
 }