Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit48fdb67

Browse files
author
zhourenjian
committed
Replace Java builder with Java2Script builder and others (merge branch 3.3)
1 parentc080c07 commit48fdb67

File tree

6 files changed

+179
-19
lines changed

6 files changed

+179
-19
lines changed

‎src/net/sf/j2s/ui/property/J2SPropertyPage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public boolean performOk() {
191191
try {
192192
Java2ScriptProjectNaturepn =newJava2ScriptProjectNature();
193193
pn.setProject(project);
194-
pn.addToBuildSpec("net.sf.j2s.core.java2scriptbuilder");
194+
pn.configure();
195195
}catch (CoreExceptione) {
196196
e.printStackTrace();
197197
}
@@ -206,7 +206,7 @@ public boolean performOk() {
206206
try {
207207
Java2ScriptProjectNaturepn =newJava2ScriptProjectNature();
208208
pn.setProject(project);
209-
pn.removeFromBuildSpec("net.sf.j2s.core.java2scriptbuilder");
209+
pn.deconfigure();
210210
}catch (CoreExceptione) {
211211
e.printStackTrace();
212212
}

‎src/net/sf/j2s/ui/wizards/Java2ScriptAJAXProjectWizard.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
importjava.io.FileNotFoundException;
1717
importjava.io.FileOutputStream;
1818
importjava.io.IOException;
19+
importjava.util.ArrayList;
20+
importjava.util.List;
21+
22+
importorg.eclipse.core.runtime.IPath;
23+
importorg.eclipse.core.runtime.Path;
24+
importorg.eclipse.jdt.core.IClasspathEntry;
25+
importorg.eclipse.jdt.core.JavaCore;
26+
1927
importnet.sf.j2s.ui.launching.J2SLaunchingUtil;
2028
importnet.sf.j2s.ui.property.J2SClasspathModel;
2129

@@ -35,6 +43,17 @@ protected void updateJava2ScriptWizardTitle() {
3543

3644
protectedvoidupdateJava2ScriptLibraries(J2SClasspathModelclasspathModel,Stringj2sLibPath) {
3745
}
46+
47+
protectedIClasspathEntry[]updateJavaLibraries(
48+
IClasspathEntry[]defaultEntries) {
49+
Listlist =newArrayList();
50+
for (inti =0;i <defaultEntries.length;i++) {
51+
list.add(i,defaultEntries[i]);
52+
}
53+
list.add(JavaCore.newVariableEntry(newPath("AJAX_CORE"),newPath("AJAX_CORE_SRC"),null));
54+
list.add(JavaCore.newVariableEntry(newPath("AJAX_RPC"),newPath("AJAX_RPC_SRC"),null));
55+
returnsuper.updateJavaLibraries((IClasspathEntry[])list.toArray(newIClasspathEntry[list.size()]));
56+
}
3857

3958
protectedvoidupdateJava2ScriptProject(StringprjFolder,StringbinRelative) {
4059
try {

‎src/net/sf/j2s/ui/wizards/Java2ScriptProjectWizard.java‎

Lines changed: 101 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,95 @@
1515
importjava.io.FileNotFoundException;
1616
importjava.io.FileOutputStream;
1717
importjava.io.IOException;
18-
importjava.util.Iterator;
19-
importjava.util.List;
18+
importjava.lang.reflect.InvocationTargetException;
2019
importjava.util.Properties;
20+
2121
importnet.sf.j2s.core.Java2ScriptProjectNature;
2222
importnet.sf.j2s.ui.classpath.IRuntimeClasspathEntry;
2323
importnet.sf.j2s.ui.classpath.Resource;
2424
importnet.sf.j2s.ui.launching.JavaRuntime;
2525
importnet.sf.j2s.ui.property.FileUtil;
2626
importnet.sf.j2s.ui.property.J2SClasspathModel;
2727
importnet.sf.j2s.ui.resources.ExternalResources;
28+
2829
importorg.eclipse.core.resources.IProject;
2930
importorg.eclipse.core.resources.IncrementalProjectBuilder;
3031
importorg.eclipse.core.runtime.CoreException;
32+
importorg.eclipse.core.runtime.IConfigurationElement;
33+
importorg.eclipse.core.runtime.IExecutableExtension;
34+
importorg.eclipse.core.runtime.IPath;
3135
importorg.eclipse.core.runtime.IProgressMonitor;
36+
importorg.eclipse.jdt.core.IClasspathEntry;
37+
importorg.eclipse.jdt.core.IJavaElement;
3238
importorg.eclipse.jdt.core.IJavaProject;
39+
importorg.eclipse.jdt.core.JavaCore;
3340
importorg.eclipse.jdt.core.JavaModelException;
34-
importorg.eclipse.jdt.internal.ui.wizards.JavaProjectWizard;
41+
importorg.eclipse.jdt.internal.ui.JavaPlugin;
42+
importorg.eclipse.jdt.internal.ui.JavaPluginImages;
43+
importorg.eclipse.jdt.internal.ui.util.ExceptionHandler;
44+
importorg.eclipse.jdt.internal.ui.wizards.JavaProjectWizardFirstPage;
45+
importorg.eclipse.jdt.internal.ui.wizards.JavaProjectWizardSecondPage;
46+
importorg.eclipse.jdt.internal.ui.wizards.NewElementWizard;
47+
importorg.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
3548
importorg.eclipse.jface.preference.PreferenceDialog;
49+
importorg.eclipse.swt.widgets.Shell;
50+
importorg.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
3651

3752
/**
3853
* @author zhou renjian
3954
*
4055
* 2007-3-4
4156
*/
42-
publicclassJava2ScriptProjectWizardextendsJavaProjectWizard {
43-
/**
44-
*
45-
*/
46-
publicJava2ScriptProjectWizard() {
47-
super();
57+
publicclassJava2ScriptProjectWizardextendsNewElementWizardimplementsIExecutableExtension {
58+
59+
privateJavaProjectWizardFirstPagefFirstPage;
60+
privateJavaProjectWizardSecondPagefSecondPage;
61+
62+
privateIConfigurationElementfConfigElement;
63+
64+
publicJava2ScriptProjectWizard() {
65+
setDefaultPageImageDescriptor(JavaPluginImages.DESC_WIZBAN_NEWJPRJ);
66+
setDialogSettings(JavaPlugin.getDefault().getDialogSettings());
67+
setWindowTitle(NewWizardMessages.JavaProjectWizard_title);
4868
updateJava2ScriptWizardTitle();
49-
}
69+
}
5070

51-
protectedvoidupdateJava2ScriptWizardTitle() {
52-
setWindowTitle(getWindowTitle() +" with Java2Script Enabled");
53-
}
54-
71+
/*
72+
* @see Wizard#addPages
73+
*/
74+
publicvoidaddPages() {
75+
super.addPages();
76+
fFirstPage=newJavaProjectWizardFirstPage();
77+
addPage(fFirstPage);
78+
fSecondPage=newJavaProjectWizardSecondPage(fFirstPage) {
79+
80+
publicvoidinit(IJavaProjectjproject,IPathdefaultOutputLocation,
81+
IClasspathEntry[]defaultEntries,
82+
booleandefaultsOverrideExistingClasspath) {
83+
super.init(jproject,defaultOutputLocation,updateJavaLibraries(defaultEntries),
84+
defaultsOverrideExistingClasspath);
85+
}
86+
87+
};
88+
addPage(fSecondPage);
89+
}
90+
91+
/* (non-Javadoc)
92+
* @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor)
93+
*/
94+
protectedvoidfinishPage(IProgressMonitormonitor)throwsInterruptedException,CoreException {
95+
fSecondPage.performFinish(monitor);// use the full progress monitor
96+
}
97+
5598
/* (non-Javadoc)
56-
* @see org.eclipse.jdt.internal.ui.wizards.JavaProjectWizard#performFinish()
99+
* @see org.eclipse.jface.wizard.IWizard#performFinish()
57100
*/
58101
publicbooleanperformFinish() {
59-
booleanfinished=super.performFinish();
102+
booleanfinished=super.performFinish();
60103
if (finished) {
104+
BasicNewProjectResourceWizard.updatePerspective(fConfigElement);
105+
selectAndReveal(fSecondPage.getJavaProject().getProject());
106+
61107
if (getContainer()instanceofPreferenceDialog) {
62108
PreferenceDialogdialog = (PreferenceDialog)getContainer();
63109
dialog.close();
@@ -139,7 +185,7 @@ public boolean performFinish() {
139185
try {
140186
Java2ScriptProjectNaturepn =newJava2ScriptProjectNature();
141187
pn.setProject(project);
142-
pn.addToBuildSpec("net.sf.j2s.core.java2scriptbuilder");
188+
pn.configure();
143189
}catch (CoreExceptione) {
144190
e.printStackTrace();
145191
}
@@ -151,10 +197,48 @@ public boolean performFinish() {
151197
}
152198
returnfinished;
153199
}
200+
201+
protectedvoidhandleFinishException(Shellshell,InvocationTargetExceptione) {
202+
Stringtitle=NewWizardMessages.JavaProjectWizard_op_error_title;
203+
Stringmessage=NewWizardMessages.JavaProjectWizard_op_error_create_message;
204+
ExceptionHandler.handle(e,getShell(),title,message);
205+
}
206+
207+
/*
208+
* Stores the configuration element for the wizard. The config element will be used
209+
* in <code>performFinish</code> to set the result perspective.
210+
*/
211+
publicvoidsetInitializationData(IConfigurationElementcfig,StringpropertyName,Objectdata) {
212+
fConfigElement=cfig;
213+
}
214+
215+
/* (non-Javadoc)
216+
* @see IWizard#performCancel()
217+
*/
218+
publicbooleanperformCancel() {
219+
fSecondPage.performCancel();
220+
returnsuper.performCancel();
221+
}
222+
223+
/* (non-Javadoc)
224+
* @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement()
225+
*/
226+
publicIJavaElementgetCreatedElement() {
227+
returnJavaCore.create(fFirstPage.getProjectHandle());
228+
}
229+
230+
protectedvoidupdateJava2ScriptWizardTitle() {
231+
setWindowTitle(getWindowTitle() +" with Java2Script Enabled");
232+
}
154233

155234
protectedvoidupdateJava2ScriptLibraries(J2SClasspathModelclasspathModel,Stringj2sLibPath) {
156235
}
157236

158237
protectedvoidupdateJava2ScriptProject(StringprjFolder,StringbinRelative) {
159238
}
239+
240+
protectedIClasspathEntry[]updateJavaLibraries(IClasspathEntry[]defaultEntries) {
241+
returndefaultEntries;
242+
}
243+
160244
}

‎src/net/sf/j2s/ui/wizards/Java2ScriptSWTAJAXProjectWizard.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
importjava.io.FileNotFoundException;
1717
importjava.io.FileOutputStream;
1818
importjava.io.IOException;
19+
importjava.util.ArrayList;
20+
importjava.util.List;
21+
22+
importorg.eclipse.core.runtime.IPath;
23+
importorg.eclipse.core.runtime.Path;
24+
importorg.eclipse.jdt.core.IClasspathEntry;
25+
importorg.eclipse.jdt.core.JavaCore;
26+
1927
importnet.sf.j2s.ui.classpath.IRuntimeClasspathEntry;
2028
importnet.sf.j2s.ui.classpath.Resource;
2129
importnet.sf.j2s.ui.launching.J2SLaunchingUtil;
@@ -43,6 +51,18 @@ protected void updateJava2ScriptLibraries(J2SClasspathModel classpathModel, Stri
4351
classpathModel.addResource((Resource)entry);
4452
}
4553
}
54+
55+
protectedIClasspathEntry[]updateJavaLibraries(
56+
IClasspathEntry[]defaultEntries) {
57+
Listlist =newArrayList();
58+
for (inti =0;i <defaultEntries.length;i++) {
59+
list.add(i,defaultEntries[i]);
60+
}
61+
list.add(JavaCore.newVariableEntry(newPath("ECLIPSE_SWT"),null,null));
62+
list.add(JavaCore.newVariableEntry(newPath("AJAX_SWT"),newPath("AJAX_SWT_SRC"),null));
63+
list.add(JavaCore.newVariableEntry(newPath("AJAX_RPC"),newPath("AJAX_RPC_SRC"),null));
64+
returnsuper.updateJavaLibraries((IClasspathEntry[])list.toArray(newIClasspathEntry[list.size()]));
65+
}
4666

4767
protectedvoidupdateJava2ScriptProject(StringprjFolder,StringbinRelative) {
4868
try {

‎src/net/sf/j2s/ui/wizards/Java2ScriptSWTProjectWizard.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
importjava.io.FileNotFoundException;
1717
importjava.io.FileOutputStream;
1818
importjava.io.IOException;
19+
importjava.util.ArrayList;
20+
importjava.util.List;
21+
22+
importorg.eclipse.core.runtime.IPath;
23+
importorg.eclipse.core.runtime.Path;
24+
importorg.eclipse.jdt.core.IClasspathEntry;
25+
importorg.eclipse.jdt.core.JavaCore;
26+
1927
importnet.sf.j2s.ui.classpath.IRuntimeClasspathEntry;
2028
importnet.sf.j2s.ui.classpath.Resource;
2129
importnet.sf.j2s.ui.launching.J2SLaunchingUtil;
@@ -43,6 +51,16 @@ protected void updateJava2ScriptLibraries(J2SClasspathModel classpathModel, Stri
4351
classpathModel.addResource((Resource)entry);
4452
}
4553
}
54+
55+
protectedIClasspathEntry[]updateJavaLibraries(
56+
IClasspathEntry[]defaultEntries) {
57+
Listlist =newArrayList();
58+
for (inti =0;i <defaultEntries.length;i++) {
59+
list.add(i,defaultEntries[i]);
60+
}
61+
list.add(JavaCore.newVariableEntry(newPath("ECLIPSE_SWT"),null,null));
62+
returnsuper.updateJavaLibraries((IClasspathEntry[])list.toArray(newIClasspathEntry[list.size()]));
63+
}
4664

4765
protectedvoidupdateJava2ScriptProject(StringprjFolder,StringbinRelative) {
4866
try {

‎src/net/sf/j2s/ui/wizards/Java2ScriptServletProjectWizard.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
importjava.io.FileOutputStream;
1818
importjava.io.IOException;
1919
importjava.net.URL;
20+
importjava.util.ArrayList;
21+
importjava.util.Arrays;
22+
importjava.util.List;
23+
2024
importnet.sf.j2s.ajax.AjaxPlugin;
2125
importnet.sf.j2s.ui.classpath.IRuntimeClasspathEntry;
2226
importnet.sf.j2s.ui.classpath.Resource;
@@ -26,6 +30,9 @@
2630
importorg.eclipse.core.runtime.IPath;
2731
importorg.eclipse.core.runtime.Path;
2832
importorg.eclipse.core.runtime.Platform;
33+
importorg.eclipse.jdt.core.IClasspathEntry;
34+
importorg.eclipse.jdt.core.JavaCore;
35+
importorg.eclipse.jdt.internal.ui.wizards.buildpaths.CPVariableElement;
2936

3037
/**
3138
* @author zhou renjian
@@ -48,6 +55,18 @@ protected void updateJava2ScriptLibraries(J2SClasspathModel classpathModel, Stri
4855
classpathModel.addResource((Resource)entry);
4956
}
5057
}
58+
59+
protectedIClasspathEntry[]updateJavaLibraries(
60+
IClasspathEntry[]defaultEntries) {
61+
Listlist =newArrayList();
62+
for (inti =0;i <defaultEntries.length;i++) {
63+
list.add(i,defaultEntries[i]);
64+
}
65+
list.add(JavaCore.newVariableEntry(newPath("ECLIPSE_SWT"),null,null));
66+
list.add(JavaCore.newVariableEntry(newPath("AJAX_SWT"),newPath("AJAX_SWT_SRC"),null));
67+
list.add(JavaCore.newVariableEntry(newPath("AJAX_RPC"),newPath("AJAX_RPC_SRC"),null));
68+
returnsuper.updateJavaLibraries((IClasspathEntry[])list.toArray(newIClasspathEntry[list.size()]));
69+
}
5170

5271
protectedvoidupdateJava2ScriptProject(StringprjFolder,StringbinRelative) {
5372
try {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp