NodeEditor is changed to be based on JSDT editor

Author: tomotaro1065

org.nodeclipse.debug/plugin.xml

@@ -4,7 +4,12 @@
     <extension point="org.eclipse.core.runtime.adapters">
         <factory
             class="org.nodeclipse.debug.model.BreakpointAdapterFactory"
-            adaptableType="org.eclipse.ui.texteditor.ITextEditor">
+            adaptableType="org.chromium.debug.ui.editors.JsEditor">
+          <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget" /> 
+        </factory>
+        <factory
+            class="org.nodeclipse.debug.model.BreakpointAdapterFactory"
+            adaptableType="org.nodeclipse.ui.editors.NodeEditor">
           <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget" /> 
         </factory>
     </extension>

org.nodeclipse.debug/src/org/nodeclipse/debug/model/NodeBreakpointAdapter.java

@@ -38,7 +38,7 @@ public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection)
 			}
 
 			addBreakpoint(resource, lineNumber);
-			if(res2.exists()) {
+			if(res2 != null && res2.exists()) {
 				addBreakpoint(res2, lineNumber);
 			}
 		}

org.nodeclipse.ui/META-INF/MANIFEST.MF

@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.debug.ui,
  org.eclipse.ui.navigator,
- org.chromium.debug.ui;bundle-version="0.3.9"
+ org.chromium.debug.ui;bundle-version="0.3.9",
+ org.eclipse.wst.jsdt.core;bundle-version="1.1.102",
+ org.eclipse.wst.jsdt.ui;bundle-version="1.1.102"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.nodeclipse.ui,

org.nodeclipse.ui/common-templates/README.md

@@ -11,5 +11,5 @@
 ## Developing
 
 
-Created with [Nodeclipse v0.4](https://github.com/Nodeclipse/nodeclipse-1)
+Created with [Nodeclipse v0.3](https://github.com/Nodeclipse/nodeclipse-1)
  ([Eclipse Marketplace](http://marketplace.eclipse.org/content/nodeclipse), [site](http://www.nodeclipse.org))   

org.nodeclipse.ui/src/org/nodeclipse/ui/editors/NodeEditor.java

@@ -1,5 +1,12 @@
 package org.nodeclipse.ui.editors;
 
+import org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditor;
+
+@SuppressWarnings("restriction")
+public class NodeEditor extends CompilationUnitEditor {
+}
+ 
+/*
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
@@ -26,9 +33,6 @@ protected void initializeEditor() {
         setDocumentProvider(new NodeDocumentProvider());
     }
 
-    /**
-     * 匹配双括号
-     */
     @Override
     protected void configureSourceViewerDecorationSupport(SourceViewerDecorationSupport support) {
         super.configureSourceViewerDecorationSupport(support);
@@ -46,3 +50,4 @@ protected void configureSourceViewerDecorationSupport(SourceViewerDecorationSupp
     }
 
 }
+*/

org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/AbstractNodeProjectWizard.java

@@ -14,6 +14,7 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -33,7 +34,9 @@
 import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
 import org.eclipse.ui.wizards.datatransfer.ImportOperation;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+import org.eclipse.wst.jsdt.core.JavaScriptCore;
 import org.nodeclipse.ui.Activator;
+import org.nodeclipse.ui.nature.NodeNature;
 import org.nodeclipse.ui.perspectives.NodePerspective;
 import org.osgi.framework.Bundle;
 
@@ -76,6 +79,21 @@ public boolean performFinish() {
     }
 
     protected abstract IProject createNewProject();
+    
+    protected IProjectDescription createProjectDescription(IProject newProjectHandle, URI location) {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		final IProjectDescription description = workspace
+				.newProjectDescription(newProjectHandle.getName());
+		description.setLocationURI(location);
+		String[] natures = description.getNatureIds();
+		String[] newNatures = new String[natures.length + 2];
+		System.arraycopy(natures, 0, newNatures, 0, natures.length);
+		newNatures[natures.length] = NodeNature.NATURE_ID;
+		newNatures[natures.length+1] = JavaScriptCore.NATURE_ID;
+		description.setNatureIds(newNatures);    	
+		
+		return description;
+    }
 
     protected void generateTemplates(String path, IProject projectHandle) throws CoreException {
 		Bundle bundle = Activator.getDefault().getBundle();

org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/ExpressProjectWizard.java

@@ -82,7 +82,7 @@ protected IProject createNewProject() {
 		if (!mainPage.useDefaults()) {
 			location = mainPage.getLocationURI();
 		}
-
+/*
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		final IProjectDescription description = workspace
 				.newProjectDescription(newProjectHandle.getName());
@@ -92,7 +92,8 @@ protected IProject createNewProject() {
 		System.arraycopy(natures, 0, newNatures, 0, natures.length);
 		newNatures[natures.length] = NodeNature.NATURE_ID;
 		description.setNatureIds(newNatures);
-
+*/
+		final IProjectDescription description = createProjectDescription(newProjectHandle, location);
 		final boolean exists = isExistsProjectFolder(description);
 		final String projectName = mainPage.getProjectName();
 		final String templateEngine = mainPage.getSelectedTemplateEngine();

org.nodeclipse.ui/src/org/nodeclipse/ui/wizards/NodeProjectWizard.java

@@ -102,7 +102,7 @@ protected IProject createNewProject() {
 		if (!mainPage.useDefaults()) {
 			location = mainPage.getLocationURI();
 		}
-
+/*
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		final IProjectDescription description = workspace
 				.newProjectDescription(newProjectHandle.getName());
@@ -112,7 +112,8 @@ protected IProject createNewProject() {
 		System.arraycopy(natures, 0, newNatures, 0, natures.length);
 		newNatures[natures.length] = NodeNature.NATURE_ID;
 		description.setNatureIds(newNatures);
-
+*/
+		final IProjectDescription description = createProjectDescription(newProjectHandle, location);
 		final boolean exists = isExistsProjectFolder(description);
 
 		IRunnableWithProgress op = new IRunnableWithProgress() {