Skip to content

Commit 0dcc69f

Browse files
author
zhourenjian
committed
Fixed a bug that a checkbox in Java2Script Application Misc Tab is in opposite status.
1 parent 8f0dc69 commit 0dcc69f

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
public static final String HEAD_HEADER_HTML = "head.header.html";
1414

1515
public static final String J2S_MOZILLA_ADDON_COMPATIABLE = "j2s.mozilla.addon.compatiable";
16-
public static final String J2S_MOZILLA_ADDON_COMPATIABLE_JS = "j2s.mozilla.addon.compatiable.js";
16+
public static final String J2S_MOZILLA_ADDON_COMPATIABLE_RAW_JS = "j2s.mozilla.addon.compatiable.raw.js";
1717

1818
public static final String J2S_CLASS_PATH = "j2s.class.path";
1919
public static final String J2S_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
private Button btnCompatiable;
2727

28-
private Button btnCompatiableJS; // whether import or include mozilla.addon.js
28+
private Button btnCompatiableRawJS; // whether import or include mozilla.addon.js
2929

3030
private Button btnFastView;
3131

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

99-
btnCompatiableJS = new Button(group, SWT.CHECK);
99+
btnCompatiableRawJS = new Button(group, SWT.CHECK);
100100
GridData gdjs = new GridData();
101101
gdjs.horizontalIndent = 32;
102-
btnCompatiableJS.setLayoutData(gdjs);
103-
btnCompatiableJS.setText("Write compatiable JavaScript instead of including mozilla.addon.js");
104-
btnCompatiableJS.addSelectionListener(new SelectionAdapter() {
102+
btnCompatiableRawJS.setLayoutData(gdjs);
103+
btnCompatiableRawJS.setText("Write compatiable JavaScript instead of including mozilla.addon.js");
104+
btnCompatiableRawJS.addSelectionListener(new SelectionAdapter() {
105105
public void widgetSelected(SelectionEvent e) {
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
public void initializeFrom(ILaunchConfiguration configuration) {
@@ -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
IPreferenceStore store = Java2ScriptUIPlugin.getDefault()
144144
.getPreferenceStore();
@@ -156,7 +156,7 @@ public void initializeFrom(ILaunchConfiguration configuration) {
156156
boolean compatiable = configuration.getAttribute(
157157
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE, preferred);
158158
btnCompatiable.setSelection(compatiable);
159-
btnCompatiableJS.setEnabled(compatiable);
159+
btnCompatiableRawJS.setEnabled(compatiable);
160160

161161
} catch (CoreException e) {
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
public String getName() {

‎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
boolean addonCompatiableJS = 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
package net.sf.j2s.ui.launching;
22

33
import java.io.ByteArrayInputStream;
4-
import java.io.ByteArrayOutputStream;
54
import java.io.File;
65
import java.io.FileInputStream;
76
import java.io.FileNotFoundException;
87
import java.io.FileOutputStream;
98
import java.io.IOException;
10-
import java.io.InputStream;
119
import java.net.MalformedURLException;
1210
import java.util.HashSet;
1311
import java.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-
boolean addonCompatiableJS = configuration.getAttribute(
762-
IJ2SLauchingConfiguration.J2S_MOZILLA_ADDON_COMPATIABLE_JS, false);
759+
boolean addonCompatiableRawJS = 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)