Skip to content

Commit e788fc6

Browse files
BobHansonBobHanson
committed
cleaned zip
1 parent 0eade1d commit e788fc6

File tree

7 files changed

+81
-4
lines changed

7 files changed

+81
-4
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

-4.37 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200104085654
1+
20200104112434

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.6/SwingJS-site.zip‎

-4.37 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.6/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200104085654
1+
20200104112434

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,19 @@ class Java2ScriptCompiler {
9797
private static final String J2S_COMPILER_READ_ANNOTATIONS = "j2s.compiler.read.annotations";
9898
private static final String J2S_COMPILER_READ_ANNOTATIONS_DEFAULT = "true";
9999
private static final String J2S_COMPILER_IGNORED_ANNOTATIONS = "j2s.compiler.ignored.annotations";
100-
private static final String J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT = "CallerSensitive;ConstructorProperties;Deprecated;Override;SaveVarargs;SuppressWarnings;";
100+
private static final String J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT =
101+
"CallerSensitive;"
102+
+ "ConstructorProperties;"
103+
+ "Deprecated;"
104+
+ "Override;"
105+
+ "SafeVarargs;"
106+
+ "SuppressWarnings;"
107+
+ "FunctionalInterface;"
108+
+ "Documented;"
109+
+ "Inherited;"
110+
+ "Native;"
111+
+ "Repeatable;"
112+
+ "Retention;";
101113

102114
private static final String J2S_COMPILER_NONQUALIFIED_PACKAGES = "j2s.compiler.nonqualified.packages";
103115
private static final String J2S_COMPILER_NONQUALIFIED_PACKAGES_DEFAULT = "<none>";
@@ -549,6 +561,7 @@ private String getDefaultJ2SFile() {
549561
return "#j2s default configuration file created by net.sf.java2script_"
550562
+ CorePlugin.VERSION + " " + new Date() + "\n\n" +
551563
"#enable the Java2Script transpiler -- comment out to disable\n" +
564+
"# default is \"enabled\".\n" +
552565
"j2s.compiler.status=enable\n" +
553566
"\n" +
554567
"\n" +
@@ -557,9 +570,15 @@ private String getDefaultJ2SFile() {
557570
"\n" +
558571
"# uncomment j2s.* lines to process:\n" +
559572
"\n" +
560-
"# a semicolon-separated list of package-level file paths to be excluded\n" +
573+
"# a semicolon-separated list of package-level file paths to be excluded (default \"<none>\")\n" +
561574
"#j2s.excluded.paths=test;testng\n" +
562575
"\n" +
576+
"# whether to read annotations\n" +
577+
"#j2s.compiler.read.annotations="+ J2S_COMPILER_READ_ANNOTATIONS_DEFAULT +"\n" +
578+
"\n" +
579+
"# a semicolon-separated list of annotations to ignore, if reading annotations\n" +
580+
"#j2s.compiler.ignored.annotations="+ J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT +"\n" +
581+
"\n" +
563582
"# output file name for logging methods declared - delete the file to regenerate a listing \n" +
564583
"#j2s.log.methods.declared=methodsDeclared.csv\n" +
565584
"\n" +
@@ -577,6 +596,7 @@ private String getDefaultJ2SFile() {
577596
"# methods such as calling window or jQuery functions or the methods in Clazz or J2S. \n" +
578597
"# The classes must not have any methods that are overloaded - with the\n" +
579598
"# same name but different paramater type, as JavaScript will only see the last one.\n" +
599+
"# default is \"<none>\".\n" +
580600
"#j2s.compiler.nonqualified.packages=org.jmol.api.js;jspecview.api.js\n" +
581601
"\n" +
582602
"# uncomment to add debugging output. Start eclipse with the -consoleLog option to see output.\n" +
@@ -588,6 +608,7 @@ private String getDefaultJ2SFile() {
588608
"# have exactly the same parameter signature. We use it in Jalview to provide a minimal\n" +
589609
"# JavaScript implementation of a large third-party library while still using that library's\n" +
590610
"# jar file in Java.\n" +
611+
"# default is \"<none>\".\n" +
591612
"#j2s.class.replacements=org.apache.log4j.->jalview.javascript.log4j.\n" +
592613
"\n" +
593614
"# uncomment and change if you do not want to use the template.html file created for you\n" +

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

-4.37 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/test/Prioritized.java‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* #%L
3+
* SciJava Common shared library for SciJava software.
4+
* %%
5+
* Copyright (C) 2009 - 2017 Board of Regents of the University of
6+
* Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
7+
* Institute of Molecular Cell Biology and Genetics, University of
8+
* Konstanz, and KNIME GmbH.
9+
* %%
10+
* Redistribution and use in source and binary forms, with or without
11+
* modification, are permitted provided that the following conditions are met:
12+
*
13+
* 1. Redistributions of source code must retain the above copyright notice,
14+
* this list of conditions and the following disclaimer.
15+
* 2. Redistributions in binary form must reproduce the above copyright notice,
16+
* this list of conditions and the following disclaimer in the documentation
17+
* and/or other materials provided with the distribution.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
23+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
* POSSIBILITY OF SUCH DAMAGE.
30+
* #L%
31+
*/
32+
33+
package test;
34+
35+
/**
36+
* An object that can be sorted according to priority.
37+
*
38+
* @author Curtis Rueden
39+
*/
40+
public interface Prioritized extends Comparable<Prioritized> {
41+
42+
/**
43+
* Gets the sort priority of the object.
44+
*
45+
* @see Priority
46+
*/
47+
double getPriority();
48+
49+
50+
@Override
51+
default int compareTo(final Prioritized that) {
52+
if (that == null) return 1;
53+
return 0;
54+
}
55+
56+
}

0 commit comments

Comments
 (0)