Skip to content

Commit f41d0a7

Browse files
shai-almogshai-almog
committed
Fixed lookup generation logic
1 parent 9a84127 commit f41d0a7

79 files changed

Lines changed: 3448 additions & 1942 deletions

File tree

Some content is hidden

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

‎scripts/cn1playground/common/src/main/java/bsh/cn1/GeneratedCN1Access.java‎

Lines changed: 631 additions & 456 deletions
Large diffs are not rendered by default.

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_ads.java‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,37 @@ private GeneratedAccess_com_codename1_ads() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.ads.AdsService".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("AdsService".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.ads -> com.codename1.ads.AdsService");
1330
}
1431
return com.codename1.ads.AdsService.class;
1532
}
16-
if ("com.codename1.ads.InnerActive".equals(name)) {
17-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
33+
if ("InnerActive".equals(simpleName)) {
34+
if (simpleName != null) {
1835
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.ads -> com.codename1.ads.InnerActive");
1936
}
2037
return com.codename1.ads.InnerActive.class;
2138
}
2239
return null;
2340
}
24-
2541
public static Object construct(Class<?> type, Object[] args) throws Exception {
2642
Object[] safeArgs = safeArgs(args);
2743
throw unsupportedConstruct(type, safeArgs);

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_analytics.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,31 @@ private GeneratedAccess_com_codename1_analytics() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.analytics.AnalyticsService".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("AnalyticsService".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.analytics -> com.codename1.analytics.AnalyticsService");
1330
}
1431
return com.codename1.analytics.AnalyticsService.class;
1532
}
1633
return null;
1734
}
18-
1935
public static Object construct(Class<?> type, Object[] args) throws Exception {
2036
Object[] safeArgs = safeArgs(args);
2137
throw unsupportedConstruct(type, safeArgs);

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_annotations.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,31 @@ private GeneratedAccess_com_codename1_annotations() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.annotations.Async".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("Async".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.annotations -> com.codename1.annotations.Async");
1330
}
1431
return com.codename1.annotations.Async.class;
1532
}
1633
return null;
1734
}
18-
1935
public static Object construct(Class<?> type, Object[] args) throws Exception {
2036
Object[] safeArgs = safeArgs(args);
2137
throw unsupportedConstruct(type, safeArgs);

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_background.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,31 @@ private GeneratedAccess_com_codename1_background() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.background.BackgroundFetch".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("BackgroundFetch".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.background -> com.codename1.background.BackgroundFetch");
1330
}
1431
return com.codename1.background.BackgroundFetch.class;
1532
}
1633
return null;
1734
}
18-
1935
public static Object construct(Class<?> type, Object[] args) throws Exception {
2036
Object[] safeArgs = safeArgs(args);
2137
throw unsupportedConstruct(type, safeArgs);

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_capture.java‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,37 @@ private GeneratedAccess_com_codename1_capture() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.capture.Capture".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("Capture".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.capture -> com.codename1.capture.Capture");
1330
}
1431
return com.codename1.capture.Capture.class;
1532
}
16-
if ("com.codename1.capture.VideoCaptureConstraints".equals(name)) {
17-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
33+
if ("VideoCaptureConstraints".equals(simpleName)) {
34+
if (simpleName != null) {
1835
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.capture -> com.codename1.capture.VideoCaptureConstraints");
1936
}
2037
return com.codename1.capture.VideoCaptureConstraints.class;
2138
}
2239
return null;
2340
}
24-
2541
public static Object construct(Class<?> type, Object[] args) throws Exception {
2642
Object[] safeArgs = safeArgs(args);
2743
if (type == com.codename1.capture.VideoCaptureConstraints.class) {

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_charts.java‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,37 @@ private GeneratedAccess_com_codename1_charts() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.charts.ChartComponent".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("ChartComponent".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts -> com.codename1.charts.ChartComponent");
1330
}
1431
return com.codename1.charts.ChartComponent.class;
1532
}
16-
if ("com.codename1.charts.ChartUtil".equals(name)) {
17-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
33+
if ("ChartUtil".equals(simpleName)) {
34+
if (simpleName != null) {
1835
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts -> com.codename1.charts.ChartUtil");
1936
}
2037
return com.codename1.charts.ChartUtil.class;
2138
}
2239
return null;
2340
}
24-
2541
public static Object construct(Class<?> type, Object[] args) throws Exception {
2642
Object[] safeArgs = safeArgs(args);
2743
if (type == com.codename1.charts.ChartComponent.class) {

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_charts_compat.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,49 @@ private GeneratedAccess_com_codename1_charts_compat() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.charts.compat.Canvas".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("Canvas".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.compat -> com.codename1.charts.compat.Canvas");
1330
}
1431
return com.codename1.charts.compat.Canvas.class;
1532
}
16-
if ("com.codename1.charts.compat.GradientDrawable".equals(name)) {
17-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
33+
if ("GradientDrawable".equals(simpleName)) {
34+
if (simpleName != null) {
1835
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.compat -> com.codename1.charts.compat.GradientDrawable");
1936
}
2037
return com.codename1.charts.compat.GradientDrawable.class;
2138
}
22-
if ("com.codename1.charts.compat.Paint".equals(name)) {
23-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
39+
if ("Paint".equals(simpleName)) {
40+
if (simpleName != null) {
2441
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.compat -> com.codename1.charts.compat.Paint");
2542
}
2643
return com.codename1.charts.compat.Paint.class;
2744
}
28-
if ("com.codename1.charts.compat.PathMeasure".equals(name)) {
29-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
45+
if ("PathMeasure".equals(simpleName)) {
46+
if (simpleName != null) {
3047
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.compat -> com.codename1.charts.compat.PathMeasure");
3148
}
3249
return com.codename1.charts.compat.PathMeasure.class;
3350
}
3451
return null;
3552
}
36-
3753
public static Object construct(Class<?> type, Object[] args) throws Exception {
3854
Object[] safeArgs = safeArgs(args);
3955
if (type == com.codename1.charts.compat.Canvas.class) {

‎scripts/cn1playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_charts_models.java‎

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,69 +7,85 @@ private GeneratedAccess_com_codename1_charts_models() {
77
}
88

99
public static Class<?> findClass(String name) {
10-
if ("com.codename1.charts.models.AreaSeries".equals(name)) {
11-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
10+
int lastDot = name == null ? -1 : name.lastIndexOf('.');
11+
if (lastDot < 0 || lastDot == name.length() - 1) {
12+
return null;
13+
}
14+
return findClassBySimpleName(name.substring(lastDot + 1));
15+
}
16+
17+
public static Class<?> findClassBySimpleName(String simpleName) {
18+
Class<?> found0 = findClassChunk0(simpleName);
19+
if (found0 != null) {
20+
return found0;
21+
}
22+
return null;
23+
}
24+
25+
26+
private static Class<?> findClassChunk0(String simpleName) {
27+
if ("AreaSeries".equals(simpleName)) {
28+
if (simpleName != null) {
1229
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.AreaSeries");
1330
}
1431
return com.codename1.charts.models.AreaSeries.class;
1532
}
16-
if ("com.codename1.charts.models.CategorySeries".equals(name)) {
17-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
33+
if ("CategorySeries".equals(simpleName)) {
34+
if (simpleName != null) {
1835
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.CategorySeries");
1936
}
2037
return com.codename1.charts.models.CategorySeries.class;
2138
}
22-
if ("com.codename1.charts.models.MultipleCategorySeries".equals(name)) {
23-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
39+
if ("MultipleCategorySeries".equals(simpleName)) {
40+
if (simpleName != null) {
2441
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.MultipleCategorySeries");
2542
}
2643
return com.codename1.charts.models.MultipleCategorySeries.class;
2744
}
28-
if ("com.codename1.charts.models.Point".equals(name)) {
29-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
45+
if ("Point".equals(simpleName)) {
46+
if (simpleName != null) {
3047
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.Point");
3148
}
3249
return com.codename1.charts.models.Point.class;
3350
}
34-
if ("com.codename1.charts.models.RangeCategorySeries".equals(name)) {
35-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
51+
if ("RangeCategorySeries".equals(simpleName)) {
52+
if (simpleName != null) {
3653
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.RangeCategorySeries");
3754
}
3855
return com.codename1.charts.models.RangeCategorySeries.class;
3956
}
40-
if ("com.codename1.charts.models.SeriesSelection".equals(name)) {
41-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
57+
if ("SeriesSelection".equals(simpleName)) {
58+
if (simpleName != null) {
4259
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.SeriesSelection");
4360
}
4461
return com.codename1.charts.models.SeriesSelection.class;
4562
}
46-
if ("com.codename1.charts.models.TimeSeries".equals(name)) {
47-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
63+
if ("TimeSeries".equals(simpleName)) {
64+
if (simpleName != null) {
4865
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.TimeSeries");
4966
}
5067
return com.codename1.charts.models.TimeSeries.class;
5168
}
52-
if ("com.codename1.charts.models.XYMultipleSeriesDataset".equals(name)) {
53-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
69+
if ("XYMultipleSeriesDataset".equals(simpleName)) {
70+
if (simpleName != null) {
5471
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.XYMultipleSeriesDataset");
5572
}
5673
return com.codename1.charts.models.XYMultipleSeriesDataset.class;
5774
}
58-
if ("com.codename1.charts.models.XYSeries".equals(name)) {
59-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
75+
if ("XYSeries".equals(simpleName)) {
76+
if (simpleName != null) {
6077
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.XYSeries");
6178
}
6279
return com.codename1.charts.models.XYSeries.class;
6380
}
64-
if ("com.codename1.charts.models.XYValueSeries".equals(name)) {
65-
if (name.startsWith("com.codename1.ui.") || name.startsWith("com.codename1.components.")) {
81+
if ("XYValueSeries".equals(simpleName)) {
82+
if (simpleName != null) {
6683
com.codenameone.playground.PlaygroundContext.debug("GeneratedCN1Access helper hit com.codename1.charts.models -> com.codename1.charts.models.XYValueSeries");
6784
}
6885
return com.codename1.charts.models.XYValueSeries.class;
6986
}
7087
return null;
7188
}
72-
7389
public static Object construct(Class<?> type, Object[] args) throws Exception {
7490
Object[] safeArgs = safeArgs(args);
7591
if (type == com.codename1.charts.models.CategorySeries.class) {

0 commit comments

Comments
 (0)