Skip to content

Commit 97f851a

Browse files
committed
Remove mediator getter from Composer
1 parent 40c715a commit 97f851a

File tree

8 files changed

+5
-36
lines changed

8 files changed

+5
-36
lines changed

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,7 @@ public class FooComposer extends AbstractChildComposer<FooView> {
251251
...
252252

253253
@Override
254-
public FooMediator getMediator() {
255-
return (FooMediator) super.Mediator();
256-
}
257-
258-
@Override
259-
protected FooMediator createMediator() {
254+
public FooMediator createMediator() {
260255
return new FooComposer.Mediator();
261256
}
262257
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildComposer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,4 @@ protected abstract class Mediator extends AbstractParentComposer.Mediator implem
2929
public AbstractChildComposer(T view) {
3030
super(view);
3131
}
32-
33-
@Override
34-
public ChildMediator getMediator() {
35-
return (ChildMediator) super.getMediator();
36-
}
37-
38-
@Override
39-
protected abstract ChildMediator createMediator();
4032
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentComposer.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,8 @@ protected abstract class Mediator implements ComponentMediator {
2828

2929
private final T view;
3030

31-
private final ComponentMediator mediator;
32-
3331
public AbstractComponentComposer(T view) {
3432
this.view = view;
35-
this.mediator = createMediator();
36-
}
37-
38-
@Override
39-
public ComponentMediator getMediator() {
40-
return mediator;
4133
}
4234

4335
@Override
@@ -53,6 +45,4 @@ public void deinitialize() {
5345
protected final T getView() {
5446
return view;
5547
}
56-
57-
protected abstract ComponentMediator createMediator();
5848
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected ComponentDescriptor getDescriptor() {
131131
protected void preInitialize(T viewModel) {
132132
this.composer = createComposer();
133133
if (this.composer != null) {
134-
viewModel.setMediator(this.composer.getMediator());
134+
viewModel.setMediator(this.composer.createMediator());
135135
}
136136
}
137137

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentComposer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,4 @@ protected abstract class Mediator extends AbstractComponentComposer.Mediator imp
2929
public AbstractParentComposer(T view) {
3030
super(view);
3131
}
32-
33-
@Override
34-
public ParentMediator getMediator() {
35-
return (Mediator) super.getMediator();
36-
}
37-
38-
@Override
39-
protected abstract ParentMediator createMediator();
4032
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ChildComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
public interface ChildComposer<T extends ChildView<?>> extends ParentComposer<T> {
2424

2525
@Override
26-
ChildMediator getMediator();
26+
ChildMediator createMediator();
2727
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ComponentComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
*/
2323
public interface ComponentComposer<T extends ComponentView<?>> extends Lifecycle {
2424

25-
ComponentMediator getMediator();
25+
ComponentMediator createMediator();
2626
}

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
public interface ParentComposer<T extends ParentView<?>> extends ComponentComposer<T> {
2424

2525
@Override
26-
ParentMediator getMediator();
26+
ParentMediator createMediator();
2727
}

0 commit comments

Comments
 (0)