Skip to content

Commit 03e8ed6

Browse files
author
zhourenjian
committed
Merge from trunk after lots of new functions
1 parent 6324247 commit 03e8ed6

20 files changed

+2057
-99
lines changed

‎META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ Require-Bundle: org.eclipse.ui,
3030
net.sf.j2s.core,
3131
org.eclipse.core.filesystem;
3232
org.junit,
33-
org.eclipse.jdt.junit
33+
org.eclipse.jdt.junit,
34+
net.sf.j2s.ajax
3435
Eclipse-AutoStart: true

‎icons/e/newjprj_wiz.gif

595 Bytes
Loading

‎plugin.xml

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
<plugin>
44
<extension-point id="externalResourceProvider" name="External Resource Provider" schema="schema/externalResourceProvider.exsd"/>
55

6+
<extension
7+
point="org.eclipse.jdt.core.classpathVariableInitializer">
8+
<classpathVariableInitializer
9+
class="net.sf.j2s.ui.variables.SWTVariableInitializer"
10+
variable="ECLIPSE_SWT"/>
11+
</extension>
12+
613
<extension
714
point="org.eclipse.ui.views">
815
<category
@@ -252,6 +259,96 @@
252259
</action>
253260
</viewerContribution>
254261
</extension>
262+
<extension
263+
point="org.eclipse.jdt.ui.javadocCompletionProcessor">
264+
<javadocCompletionProcessor
265+
class="net.sf.j2s.ui.text.javadoc.JavaDocCompletionEvaluator"
266+
id="net.sf.j2s.javadocCompletionProcessor"/>
267+
</extension>
268+
<extension
269+
point="org.eclipse.ui.preferencePages">
270+
<page
271+
class="net.sf.j2s.ui.preferences.Java2ScriptPreferencePage"
272+
id="net.sf.j2s.ui.preferences.Java2ScriptPreferencePage"
273+
name="Java2Script"/>
274+
</extension>
275+
<extension
276+
point="org.eclipse.core.runtime.preferences">
277+
<initializer class="net.sf.j2s.ui.preferences.PreferenceInitializer"/>
278+
</extension>
279+
280+
<extension
281+
point="org.eclipse.ui.newWizards">
282+
<category
283+
name="Java2Script"
284+
id="net.sf.j2s.ui.java2script">
285+
</category>
286+
<wizard
287+
name="Java2Script Project"
288+
icon="icons/e/newjprj_wiz.gif"
289+
category="net.sf.j2s.ui.java2script"
290+
class="net.sf.j2s.ui.wizards.Java2ScriptProjectWizard"
291+
preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
292+
project="true"
293+
finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
294+
id="net.sf.j2s.ui.wizards.Java2ScriptProjectWizard">
295+
<description>
296+
Create Java Project with Java2Script enabled.
297+
</description>
298+
</wizard>
299+
<wizard
300+
name="Java2Script AJAX Project"
301+
icon="icons/e/newjprj_wiz.gif"
302+
category="net.sf.j2s.ui.java2script"
303+
class="net.sf.j2s.ui.wizards.Java2ScriptAJAXProjectWizard"
304+
preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
305+
project="true"
306+
finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
307+
id="net.sf.j2s.ui.wizards.Java2ScriptAJAXProjectWizard">
308+
<description>
309+
Create Java Project with Java2Script AJAX enabled.
310+
</description>
311+
</wizard>
312+
<wizard
313+
name="Java2Script SWT Project"
314+
icon="icons/e/newjprj_wiz.gif"
315+
category="net.sf.j2s.ui.java2script"
316+
class="net.sf.j2s.ui.wizards.Java2ScriptSWTProjectWizard"
317+
preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
318+
project="true"
319+
finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
320+
id="net.sf.j2s.ui.wizards.Java2ScriptSWTProjectWizard">
321+
<description>
322+
Create Java Project with Java2Script and SWT enabled.
323+
</description>
324+
</wizard>
325+
<wizard
326+
name="Java2Script SWT AJAX Project"
327+
icon="icons/e/newjprj_wiz.gif"
328+
category="net.sf.j2s.ui.java2script"
329+
class="net.sf.j2s.ui.wizards.Java2ScriptSWTAJAXProjectWizard"
330+
preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
331+
project="true"
332+
finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
333+
id="net.sf.j2s.ui.wizards.Java2ScriptSWTAJAXProjectWizard">
334+
<description>
335+
Create Java Project with Java2Script AJAX and SWT enabled.
336+
</description>
337+
</wizard>
338+
<wizard
339+
name="Java2Script Servlet Project"
340+
icon="icons/e/newjprj_wiz.gif"
341+
category="net.sf.j2s.ui.java2script"
342+
class="net.sf.j2s.ui.wizards.Java2ScriptServletProjectWizard"
343+
preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
344+
project="true"
345+
finalPerspective="org.eclipse.jdt.ui.JavaPerspective"
346+
id="net.sf.j2s.ui.wizards.Java2ScriptServletProjectWizard">
347+
<description>
348+
Create Java Servlet Project with Java2Script AJAX and SWT enabled.
349+
</description>
350+
</wizard>
351+
</extension>
255352
<!--
256353
<extension
257354
point="org.eclipse.ui.exportWizards">
@@ -273,5 +370,4 @@
273370
<partition type="__java_javadoc"/>
274371
</javaCompletionProposalComputer>
275372
</extension>
276-
277373
</plugin>

‎src/net/sf/j2s/ui/launching/ArgsUtil.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static String outputString(String s) {
127127
return buffer.toString();
128128
}
129129

130-
public static String wrapAsArgumentArray(String s) {
130+
public static String wrapAsArgumentArray(String s, boolean whitespace) {
131131
String[] args = splitArguments(s);
132132
StringBuffer buffer = new StringBuffer();
133133
buffer.append('[');
@@ -136,7 +136,10 @@ public static String wrapAsArgumentArray(String s) {
136136
buffer.append(outputString(args[i]));
137137
buffer.append('\"');
138138
if (i != args.length - 1) {
139-
buffer.append(", ");
139+
buffer.append(",");
140+
if (whitespace) {
141+
buffer.append(" ");
142+
}
140143
}
141144
}
142145
buffer.append(']');

‎src/net/sf/j2s/ui/launching/IJ2SLauchingConfiguration.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22

33
public interface IJ2SLauchingConfiguration {
44

5+
public static final String VIEW_IN_INNER_J2S_CONSOLE = "view.in.j2s.console";
56
public static final String FAST_VIEW_J2S_CONSOLE = "fast.view.j2s.console";
67
public static final String MAXIMIZE_J2S_CONSOLE = "maximize.j2s.console";
78

9+
public static final String USE_GLOBAL_ALAA_URL = "use.global.alaa.url";
10+
public static final String GLOBAL_J2SLIB_URL = "global.j2slib.url";
11+
public static final String GLOBAL_BINARY_URL = "global.bin.url";
12+
813
public static final String USE_XHTML_HEADER = "use.xhtml.header";
914
public static final String TAIL_BODY_HTML = "tail.body.html";
1015
public static final String HEAD_BODY_HTML = "head.body.html";
1116
public static final String TAIL_HEADER_HTML = "tail.header.html";
1217
public static final String HEAD_HEADER_HTML = "head.header.html";
1318

19+
public static final String J2S_MOZILLA_ADDON_COMPATIABLE = "j2s.mozilla.addon.compatiable";
20+
public static final String J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS = "j2s.mozilla.addon.compatiable.raw.js";
21+
1422
public static final String J2S_CLASS_PATH = "j2s.class.path";
1523
public static final String J2S_ABANDON_CLASS_PATH = "j2s.abandon.class.path";
1624
}

‎src/net/sf/j2s/ui/launching/J2SApplicationRunnable.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package net.sf.j2s.ui.launching;
22

3+
import java.io.File;
4+
import java.net.MalformedURLException;
5+
import java.net.URL;
36
import net.sf.j2s.ui.Java2ScriptUIPlugin;
47
import net.sf.j2s.ui.console.J2SConsoleView;
8+
import net.sf.j2s.ui.preferences.PreferenceConstants;
59

610
import org.eclipse.core.runtime.CoreException;
711
import org.eclipse.debug.core.ILaunchConfiguration;
12+
import org.eclipse.jface.preference.IPreferenceStore;
13+
import org.eclipse.swt.program.Program;
814
import org.eclipse.ui.IViewPart;
915
import org.eclipse.ui.IViewReference;
1016
import org.eclipse.ui.IWorkbenchPage;
@@ -23,16 +29,41 @@ public J2SApplicationRunnable(ILaunchConfiguration configuration, String url) {
2329
}
2430

2531
public void run() {
32+
boolean isToViewInConsole = true;
2633
boolean isViewFast = false;
2734
boolean isViewMaximize = false;
2835
try {
36+
IPreferenceStore store = Java2ScriptUIPlugin.getDefault().getPreferenceStore();
37+
38+
boolean preferred = store.getBoolean(PreferenceConstants.INNER_CONSOLE);
39+
40+
isToViewInConsole = configuration.getAttribute(
41+
IJ2SLauchingConfiguration.VIEW_IN_INNER_J2S_CONSOLE, preferred);
2942
isViewMaximize = configuration.getAttribute(
3043
IJ2SLauchingConfiguration.MAXIMIZE_J2S_CONSOLE, false);
3144
isViewFast = configuration.getAttribute(
3245
IJ2SLauchingConfiguration.FAST_VIEW_J2S_CONSOLE, false);
3346
} catch (CoreException e1) {
3447
e1.printStackTrace();
3548
}
49+
50+
if (!isToViewInConsole) {
51+
if (url != null && url.length() != 0) {
52+
try {
53+
String file = new URL(url).getFile();
54+
boolean win32 = ((System.getProperty("os.name").indexOf("Windows") != -1) //$NON-NLS-1$ //$NON-NLS-2$
55+
|| (System.getProperty("os.name").indexOf("windows") != -1)); //$NON-NLS-1$ //$NON-NLS-2$
56+
if (win32 && file.startsWith("/")) {
57+
file = file.substring(1);
58+
}
59+
file = file.replace('/', File.separatorChar);
60+
Program.launch(file);
61+
} catch (MalformedURLException e1) {
62+
e1.printStackTrace();
63+
}
64+
}
65+
return;
66+
}
3667
IWorkbenchPage activePage = Java2ScriptUIPlugin.getDefault()
3768
.getWorkbench().getWorkbenchWindows()[0].getActivePage();
3869
IViewPart console = activePage

0 commit comments

Comments
 (0)