Skip to content

Commit 8fc2468

Browse files
committed
Standardized Adapter
1 parent b9c1598 commit 8fc2468

File tree

13 files changed

+46
-47
lines changed

13 files changed

+46
-47
lines changed

src/main/java/gwt/material/design/amcharts/client/axis/DateAxis.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/main/java/gwt/material/design/amcharts/client/bullet/CircleBullet.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
package gwt.material.design.amcharts.client.bullet;
2121

22-
import gwt.material.design.amcore.client.adapter.Adapter;
23-
import gwt.material.design.amcharts.client.adapter.CircleBulletAdapter;
2422
import gwt.material.design.amcharts.client.properties.CircleBulletProperties;
2523
import gwt.material.design.amcore.client.list.DictionaryTemplate;
2624
import gwt.material.design.amcore.client.state.SpriteState;
@@ -32,9 +30,6 @@
3230
@JsType(isNative = true, namespace = "am4charts")
3331
public class CircleBullet extends Bullet {
3432

35-
@JsProperty
36-
public Adapter<CircleBullet, CircleBulletAdapter> adapter;
37-
3833
@JsProperty
3934
public Circle circle;
4035

src/main/java/gwt/material/design/amcharts/client/column/RadarColumn.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,16 @@
1919
*/
2020
package gwt.material.design.amcharts.client.column;
2121

22-
import gwt.material.design.amcharts.client.adapter.RadarColumnAdapter;
23-
import gwt.material.design.amcore.client.adapter.Adapter;
22+
import gwt.material.design.amcharts.client.properties.RadarColumnProperties;
2423
import gwt.material.design.amcore.client.base.Slice;
2524
import gwt.material.design.amcore.client.list.DictionaryTemplate;
26-
import gwt.material.design.amcharts.client.properties.RadarColumnProperties;
2725
import gwt.material.design.amcore.client.state.SpriteState;
2826
import jsinterop.annotations.JsProperty;
2927
import jsinterop.annotations.JsType;
3028

3129
@JsType(isNative = true, namespace = "am4charts")
3230
public class RadarColumn extends Column {
3331

34-
@JsProperty
35-
public Adapter<RadarColumn, RadarColumnAdapter> adapter;
36-
3732
@JsProperty
3833
public Slice radarColumn;
3934

src/main/java/gwt/material/design/amcharts/client/series/PieSeries.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121

2222
import gwt.material.design.amcharts.client.datafield.series.PieSeriesDataFields;
2323
import gwt.material.design.amcharts.client.properties.PieSeriesProperties;
24+
import gwt.material.design.amcharts.client.tick.PieTick;
2425
import gwt.material.design.amcore.client.base.Percent;
26+
import gwt.material.design.amcore.client.list.ListTemplate;
2527
import gwt.material.design.amcore.client.properties.SpriteProperties;
2628
import gwt.material.design.amcore.client.state.SpriteState;
2729
import jsinterop.annotations.JsProperty;
@@ -42,4 +44,7 @@ public class PieSeries extends PercentSeries {
4244
@JsProperty
4345
public SpriteState<PieSeriesProperties> hiddenState;
4446

47+
@JsProperty
48+
public ListTemplate<PieTick> ticks;
49+
4550
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2018 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.amcharts.client.tick;
21+
22+
import gwt.material.design.amcharts.client.axis.AxisLabelCircular;
23+
import gwt.material.design.amcore.client.base.Slice;
24+
import jsinterop.annotations.JsProperty;
25+
import jsinterop.annotations.JsType;
26+
27+
@JsType(isNative = true, namespace = "am4charts")
28+
public class PieTick extends Tick {
29+
30+
@JsProperty
31+
public AxisLabelCircular label;
32+
33+
@JsProperty
34+
public Slice slice;
35+
}

src/main/java/gwt/material/design/amcore/client/base/Language.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
package gwt.material.design.amcore.client.base;
2121

22-
import gwt.material.design.amcore.client.adapter.Adapter;
23-
import gwt.material.design.amcore.client.adapter.LanguageAdapter;
2422
import gwt.material.design.amcore.client.properties.Locale;
2523
import jsinterop.annotations.JsMethod;
2624
import jsinterop.annotations.JsProperty;
@@ -29,9 +27,6 @@
2927
@JsType(isNative = true, namespace = "am4core")
3028
public class Language extends BaseObjectsEvents {
3129

32-
@JsProperty
33-
public Adapter<Language, LanguageAdapter> adapter;
34-
3530
@JsProperty
3631
public Locale locale;
3732

src/main/java/gwt/material/design/amcore/client/base/Slice.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@
1919
*/
2020
package gwt.material.design.amcore.client.base;
2121

22-
import gwt.material.design.amcore.client.adapter.Adapter;
23-
import gwt.material.design.amcore.client.adapter.SliceAdapter;
24-
import gwt.material.design.amcore.client.adapter.SpriteAdapter;
2522
import gwt.material.design.amcore.client.color.Color;
2623
import gwt.material.design.amcore.client.list.DictionaryTemplate;
2724
import gwt.material.design.amcore.client.properties.SliceProperties;
28-
import gwt.material.design.amcore.client.properties.SpriteProperties;
2925
import gwt.material.design.amcore.client.state.SpriteState;
3026
import jsinterop.annotations.JsMethod;
3127
import jsinterop.annotations.JsProperty;
@@ -34,9 +30,6 @@
3430
@JsType(isNative = true, namespace = "am4core")
3531
public class Slice extends Container {
3632

37-
@JsProperty
38-
public Adapter<Slice, SliceAdapter> adapter;
39-
4033
@JsProperty
4134
public double arc;
4235

src/main/java/gwt/material/design/amcore/client/base/Sprite.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package gwt.material.design.amcore.client.base;
2121

2222
import gwt.material.design.amcore.client.adapter.Adapter;
23-
import gwt.material.design.amcore.client.adapter.SpriteAdapter;
2423
import gwt.material.design.amcore.client.animation.Animation;
2524
import gwt.material.design.amcore.client.animation.InertiaOptions;
2625
import gwt.material.design.amcore.client.animation.InertialTypes;
@@ -49,7 +48,7 @@
4948
public class Sprite extends BaseObjectsEvents {
5049

5150
@JsProperty
52-
public Adapter<Sprite, SpriteAdapter> adapter;
51+
public Adapter adapter;
5352

5453
/**
5554
* @see Align

src/main/java/gwt/material/design/amcore/client/dataitem/DataItem.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
package gwt.material.design.amcore.client.dataitem;
2121

2222
import com.google.gwt.core.client.JsDate;
23-
import gwt.material.design.amcore.client.adapter.Adapter;
24-
import gwt.material.design.amcore.client.adapter.DataItemAdapter;
2523
import gwt.material.design.amcore.client.animation.Animation;
2624
import gwt.material.design.amcore.client.animation.AnimationOptions;
2725
import gwt.material.design.amcore.client.base.BaseObjectsEvents;
@@ -37,9 +35,6 @@
3735
@JsType(isNative = true, namespace = "am4charts")
3836
public class DataItem extends BaseObjectsEvents {
3937

40-
@JsProperty
41-
public Adapter<DataItem, DataItemAdapter> adapter;
42-
4338
@JsProperty
4439
public Animation[] animations;
4540

src/main/java/gwt/material/design/amcore/client/formatter/DateFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
99
* You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing, software
1414
* distributed under the License is distributed on an "AS IS" BASIS,
1515
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

0 commit comments

Comments
 (0)