Skip to content

Commit 47b5932

Browse files
committed
Совместимость с Android проектом
1 parent 25d335a commit 47b5932

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+238
-140
lines changed

src/main/java/com/annimon/ownlang/Console.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
public class Console {
1010

11+
public static String newline() {
12+
return System.lineSeparator();
13+
}
14+
1115
public static void print(String value) {
1216
System.out.print(value);
1317
}

src/main/java/com/annimon/ownlang/annotations/ConstantInitializer.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/com/annimon/ownlang/lib/NumberValue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* @author aNNiMON
66
*/
77
public final class NumberValue implements Value {
8-
8+
99
public static final NumberValue MINUS_ONE, ZERO, ONE;
10-
10+
1111
private static final int CACHE_MIN = -128, CACHE_MAX = 127;
1212
private static final NumberValue[] NUMBER_CACHE;
1313
static {

src/main/java/com/annimon/ownlang/lib/modules/canvas.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
43
import com.annimon.ownlang.lib.*;
54
import java.awt.Color;
65
import java.awt.Dimension;
@@ -20,7 +19,6 @@
2019
*
2120
* @author aNNiMON
2221
*/
23-
@ConstantInitializer
2422
public final class canvas implements Module {
2523

2624
private static JFrame frame;

src/main/java/com/annimon/ownlang/lib/modules/canvasfx.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
43
import com.annimon.ownlang.exceptions.TypeException;
54
import com.annimon.ownlang.lib.*;
65
import static com.annimon.ownlang.lib.Converters.*;
@@ -43,7 +42,6 @@
4342
*
4443
* @author aNNiMON
4544
*/
46-
@ConstantInitializer
4745
public final class canvasfx implements Module {
4846

4947
private static final int FX_EFFECT_TYPE = 5301;

src/main/java/com/annimon/ownlang/lib/modules/date.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
43
import com.annimon.ownlang.exceptions.TypeException;
54
import com.annimon.ownlang.lib.*;
65
import java.text.DateFormat;
@@ -14,7 +13,6 @@
1413
*
1514
* @author aNNiMON
1615
*/
17-
@ConstantInitializer
1816
public final class date implements Module {
1917

2018
private static final int DATE_DATE_FORMAT = 9829;
@@ -197,7 +195,7 @@ private static void date(Calendar calendar, Value arg1) {
197195
}
198196
try {
199197
calendar.setTime(DateFormat.getDateTimeInstance().parse(arg1.asString()));
200-
} catch (ParseException ex) { }
198+
} catch (ParseException ignore) { }
201199
}
202200

203201
private static void date(Calendar calendar, Value arg1, Value arg2) {
@@ -207,7 +205,7 @@ private static void date(Calendar calendar, Value arg1, Value arg2) {
207205
}
208206
try {
209207
calendar.setTime(new SimpleDateFormat(arg1.asString()).parse(arg2.asString()));
210-
} catch (ParseException ex) { }
208+
} catch (ParseException ignore) { }
211209
}
212210
}
213211

src/main/java/com/annimon/ownlang/lib/modules/files.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
43
import com.annimon.ownlang.exceptions.ArgumentsMismatchException;
54
import com.annimon.ownlang.lib.*;
65
import java.io.BufferedReader;
@@ -21,7 +20,6 @@
2120
*
2221
* @author aNNiMON
2322
*/
24-
@ConstantInitializer
2523
public final class files implements Module {
2624

2725
private static Map<Integer, FileInfo> files;
@@ -34,7 +32,7 @@ public static void initConstants() {
3432
public void init() {
3533
files = new HashMap<>();
3634
initConstants();
37-
35+
3836
Functions.set("fopen", new fopen());
3937
Functions.set("flush", new flush());
4038
Functions.set("fclose", new fclose());
@@ -169,7 +167,7 @@ public Value execute(Value... args) {
169167

170168
protected abstract Value execute(FileInfo fileInfo, Value[] args) throws IOException;
171169
}
172-
170+
173171
private static class listFiles extends FileFunction {
174172
@Override
175173
protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
@@ -559,7 +557,7 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
559557
return NumberValue.ONE;
560558
}
561559
}
562-
560+
563561
private static class writeText extends FileFunction {
564562
@Override
565563
protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {

src/main/java/com/annimon/ownlang/lib/modules/forms.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
43
import com.annimon.ownlang.lib.*;
54
import com.annimon.ownlang.lib.modules.functions.forms.Components;
65
import com.annimon.ownlang.lib.modules.functions.forms.LayoutManagers;
@@ -13,7 +12,6 @@
1312
*
1413
* @author aNNiMON
1514
*/
16-
@ConstantInitializer
1715
public final class forms implements Module {
1816

1917
public static void initConstants() {

src/main/java/com/annimon/ownlang/lib/modules/functional.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.annimon.ownlang.lib.modules;
22

3-
import com.annimon.ownlang.annotations.ConstantInitializer;
4-
import com.annimon.ownlang.lib.*;
3+
import com.annimon.ownlang.lib.FunctionValue;
4+
import com.annimon.ownlang.lib.Functions;
5+
import com.annimon.ownlang.lib.Variables;
56
import com.annimon.ownlang.lib.modules.functions.*;
67

78
/**
89
*
910
* @author aNNiMON
1011
*/
11-
@ConstantInitializer
1212
public final class functional implements Module {
1313

1414
public static void initConstants() {

src/main/java/com/annimon/ownlang/lib/modules/functions/functional_chain.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.annimon.ownlang.lib.modules.functions;
22

33
import com.annimon.ownlang.exceptions.TypeException;
4-
import com.annimon.ownlang.lib.*;
4+
import com.annimon.ownlang.lib.Arguments;
5+
import com.annimon.ownlang.lib.Function;
6+
import com.annimon.ownlang.lib.FunctionValue;
7+
import com.annimon.ownlang.lib.Types;
8+
import com.annimon.ownlang.lib.Value;
59

610
public final class functional_chain implements Function {
711

@@ -21,4 +25,4 @@ public Value execute(Value... args) {
2125
return result;
2226
}
2327

24-
}
28+
}

0 commit comments

Comments
 (0)