Skip to content

Commit 59fa482

Browse files
author
jossonsmith
committed
Fix a bug that open *.java file in a non-java project will fails
1 parent 26bb58c commit 59fa482

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/net/sf/j2s/ui/actions/OpenJSEditorAction.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package net.sf.j2s.ui.actions;
22

3+
import org.eclipse.core.resources.IResource;
34
import org.eclipse.jdt.core.ICompilationUnit;
5+
import org.eclipse.jdt.core.IJavaModel;
46
import org.eclipse.jdt.internal.ui.actions.SelectionConverter;
57
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
6-
import org.eclipse.jdt.ui.actions.ExtractMethodAction;
7-
import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds;
8-
import org.eclipse.jdt.ui.actions.SelectionDispatchAction;
98
import org.eclipse.jface.action.IAction;
109
import org.eclipse.jface.viewers.ISelection;
11-
import org.eclipse.jface.viewers.ISelectionProvider;
12-
import org.eclipse.jface.viewers.IStructuredSelection;
1310
import org.eclipse.ui.IEditorActionDelegate;
1411
import org.eclipse.ui.IEditorPart;
1512
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
@@ -72,6 +69,14 @@ public void setActiveEditor(IAction action, IEditorPart targetEditor) {
7269
ICompilationUnit unit = SelectionConverter.getInputAsCompilationUnit(editor);
7370
boolean enabled = false;
7471
if (unit != null) {
72+
IJavaModel javaModel = unit.getJavaModel();
73+
if (javaModel == null) {
74+
return;
75+
}
76+
IResource resource = javaModel.getResource();
77+
if (resource == null){
78+
return;
79+
}
7580
enabled = UnitJavaScriptUtil.isUnitJSExisted(unit);
7681
}
7782
if (!enabled) {

0 commit comments

Comments
 (0)