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

Commit0dcc69f

Browse files
author
zhourenjian
committed
Fixed a bug that a checkbox in Java2Script Application Misc Tab is in opposite status.
1 parent8f0dc69 commit0dcc69f

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public interface IJ2SLauchingConfiguration {
1313
publicstaticfinalStringHEAD_HEADER_HTML ="head.header.html";
1414

1515
publicstaticfinalStringJ2S_MOZILLA_ADDON_COMPATIABLE ="j2s.mozilla.addon.compatiable";
16-
publicstaticfinalStringJ2S_MOZILLA_ADDON_COMPATIABLE_JS ="j2s.mozilla.addon.compatiable.js";
16+
publicstaticfinalStringJ2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS ="j2s.mozilla.addon.compatiable.raw.js";
1717

1818
publicstaticfinalStringJ2S_CLASS_PATH ="j2s.class.path";
1919
publicstaticfinalStringJ2S_ABANDON_CLASS_PATH ="j2s.abandon.class.path";

‎sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SConsoleOptionsTab.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class J2SConsoleOptionsTab extends AbstractLaunchConfigurationTab {
2525

2626
privateButtonbtnCompatiable;
2727

28-
privateButtonbtnCompatiableJS;// whether import or include mozilla.addon.js
28+
privateButtonbtnCompatiableRawJS;// whether import or include mozilla.addon.js
2929

3030
privateButtonbtnFastView;
3131

@@ -92,16 +92,16 @@ public void widgetSelected(SelectionEvent e) {
9292
btnCompatiable.addSelectionListener(newSelectionAdapter() {
9393
publicvoidwidgetSelected(SelectionEvente) {
9494
updateLaunchConfigurationDialog();
95-
btnCompatiableJS.setEnabled(btnCompatiable.getSelection());
95+
btnCompatiableRawJS.setEnabled(btnCompatiable.getSelection());
9696
}
9797
});
9898

99-
btnCompatiableJS =newButton(group,SWT.CHECK);
99+
btnCompatiableRawJS =newButton(group,SWT.CHECK);
100100
GridDatagdjs =newGridData();
101101
gdjs.horizontalIndent =32;
102-
btnCompatiableJS.setLayoutData(gdjs);
103-
btnCompatiableJS.setText("Write compatiable JavaScript instead of including mozilla.addon.js");
104-
btnCompatiableJS.addSelectionListener(newSelectionAdapter() {
102+
btnCompatiableRawJS.setLayoutData(gdjs);
103+
btnCompatiableRawJS.setText("Write compatiable JavaScript instead of including mozilla.addon.js");
104+
btnCompatiableRawJS.addSelectionListener(newSelectionAdapter() {
105105
publicvoidwidgetSelected(SelectionEvente) {
106106
updateLaunchConfigurationDialog();
107107
}
@@ -128,7 +128,7 @@ public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
128128
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE,preferred);
129129

130130
configuration.setAttribute(
131-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS,false);
131+
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS,true);
132132
}
133133

134134
publicvoidinitializeFrom(ILaunchConfigurationconfiguration) {
@@ -137,8 +137,8 @@ public void initializeFrom(ILaunchConfiguration configuration) {
137137
IJ2SLauchingConfiguration.FAST_VIEW_J2S_CONSOLE,false));
138138
btnMaximize.setSelection(configuration.getAttribute(
139139
IJ2SLauchingConfiguration.MAXIMIZE_J2S_CONSOLE,false));
140-
btnCompatiableJS.setSelection(configuration.getAttribute(
141-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS,false));
140+
btnCompatiableRawJS.setSelection(configuration.getAttribute(
141+
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS,true));
142142

143143
IPreferenceStorestore =Java2ScriptUIPlugin.getDefault()
144144
.getPreferenceStore();
@@ -156,7 +156,7 @@ public void initializeFrom(ILaunchConfiguration configuration) {
156156
booleancompatiable =configuration.getAttribute(
157157
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE,preferred);
158158
btnCompatiable.setSelection(compatiable);
159-
btnCompatiableJS.setEnabled(compatiable);
159+
btnCompatiableRawJS.setEnabled(compatiable);
160160

161161
}catch (CoreExceptione) {
162162
e.printStackTrace();
@@ -173,7 +173,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
173173
configuration.setAttribute(
174174
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE,btnCompatiable.getSelection());
175175
configuration.setAttribute(
176-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS,btnCompatiableJS.getSelection());
176+
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS,btnCompatiableRawJS.getSelection());
177177
}
178178

179179
publicStringgetName() {

‎sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SLaunchingUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ private static String generateHTML(ILaunchConfiguration configuration,
738738
buf.append("};\r\n");
739739

740740
booleanaddonCompatiableJS =configuration.getAttribute(
741-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS,false);
741+
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS,false);
742742

743743
if (addonCompatiableJS) {
744744
buf.append("</script>\r\n<script type=\"text/javascript\" src=\"" +j2sLibPath +"mozilla.addon.js\">");

‎sources/net.sf.j2s.ui/src/net/sf/j2s/ui/launching/J2SUnitLaunchingUtil.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
packagenet.sf.j2s.ui.launching;
22

33
importjava.io.ByteArrayInputStream;
4-
importjava.io.ByteArrayOutputStream;
54
importjava.io.File;
65
importjava.io.FileInputStream;
76
importjava.io.FileNotFoundException;
87
importjava.io.FileOutputStream;
98
importjava.io.IOException;
10-
importjava.io.InputStream;
119
importjava.net.MalformedURLException;
1210
importjava.util.HashSet;
1311
importjava.util.Properties;
@@ -758,10 +756,10 @@ private static String generateHTML(ILaunchConfiguration configuration,
758756
buf.append("\t}\r\n");
759757
buf.append("};\r\n");
760758

761-
booleanaddonCompatiableJS =configuration.getAttribute(
762-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS,false);
759+
booleanaddonCompatiableRawJS =configuration.getAttribute(
760+
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS,true);
763761

764-
if (addonCompatiableJS) {
762+
if (!addonCompatiableRawJS) {
765763
buf.append("</script>\r\n<script type=\"text/javascript\" src=\"" +j2sLibPath +"mozilla.addon.js\">");
766764
}else {
767765
buf.append("\r\n");

0 commit comments

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