Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
a2e34b84
by Tony Chemit at 2020-12-17T19:49:47+01:00
-
fbf9c9d1
by Tony Chemit at 2020-12-17T19:50:24+01:00
-
947474e0
by Tony Chemit at 2020-12-17T21:12:11+01:00
-
d2654a9a
by Tony Chemit at 2020-12-17T21:14:52+01:00
-
725d52c6
by Tony Chemit at 2020-12-17T21:29:16+01:00
-
06056c4d
by Tony Chemit at 2020-12-17T21:34:22+01:00
-
cf8f0c51
by Tony Chemit at 2020-12-17T21:34:58+01:00
-
0ef804b0
by Tony Chemit at 2020-12-17T21:35:26+01:00
-
e3b79bfd
by Tony Chemit at 2020-12-17T21:35:41+01:00
-
fa41288e
by Tony Chemit at 2020-12-17T21:36:18+01:00
29 changed files:
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleInsert.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/MoveEdit.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/CollapseAll.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ExpandAll.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoDown.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoNext.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoPrevious.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoUp.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIActionSupport.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModel.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUIHandler.java
Changes:
| ... | ... | @@ -108,6 +108,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit |
| 108 | 108 |
} catch (Exception e) {
|
| 109 | 109 |
setNoContent();
|
| 110 | 110 |
ui.getModel().setContent(null);
|
| 111 |
+ throw e;
|
|
| 111 | 112 |
} finally {
|
| 112 | 113 |
contentAdjusting = false;
|
| 113 | 114 |
}
|
| ... | ... | @@ -427,6 +427,9 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe |
| 427 | 427 |
if (newValue == null) {
|
| 428 | 428 |
return;
|
| 429 | 429 |
}
|
| 430 |
+ if (getClientUIContext().getMainUIModel() == null) {
|
|
| 431 |
+ return;
|
|
| 432 |
+ }
|
|
| 430 | 433 |
if (getClientUIContext().getMainUIModel().isBlockFocus()) {
|
| 431 | 434 |
return;
|
| 432 | 435 |
}
|
| ... | ... | @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; |
| 45 | 45 |
public class ToggleConfigure<U extends ContentUI> extends ContentUIActionSupport<U> {
|
| 46 | 46 |
|
| 47 | 47 |
public ToggleConfigure() {
|
| 48 |
- super(null, n("observe.ui.content.action.configure.tip"), "generate", ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE);
|
|
| 48 |
+ super("", n("observe.ui.content.action.configure.tip"), "generate", ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE);
|
|
| 49 | 49 |
// setIcon(getContentScaledImage("configure"));
|
| 50 | 50 |
}
|
| 51 | 51 |
|
| ... | ... | @@ -44,7 +44,7 @@ import static io.ultreia.java4all.i18n.I18n.n; |
| 44 | 44 |
public class ToggleInsert<U extends ContentUI> extends ContentUIActionSupport<U> {
|
| 45 | 45 |
|
| 46 | 46 |
public ToggleInsert() {
|
| 47 |
- super(null, n("observe.ui.content.action.insert.tip"), "add", ObserveKeyStrokesEditorApi.KEY_STROKE_INSERT_CONFIGURE);
|
|
| 47 |
+ super("", n("observe.ui.content.action.insert.tip"), "add", ObserveKeyStrokesEditorApi.KEY_STROKE_INSERT_CONFIGURE);
|
|
| 48 | 48 |
// setIcon(getContentScaledImage("add",22));
|
| 49 | 49 |
}
|
| 50 | 50 |
|
| ... | ... | @@ -103,7 +103,7 @@ public class ChangeMode<U extends ContentUI> extends ContentUIActionSupport<U> { |
| 103 | 103 |
}
|
| 104 | 104 |
|
| 105 | 105 |
public ChangeMode(ChangeModeRequest request, ChangeModeProducer<U> changeModeProducer, ChangeModeExecutor<U> executor) {
|
| 106 |
- super(null, null, null, ObserveKeyStrokesEditorApi.KEY_STROKE_CONTENT_CHANGE_MODE);
|
|
| 106 |
+ super("", null, null, ObserveKeyStrokesEditorApi.KEY_STROKE_CONTENT_CHANGE_MODE);
|
|
| 107 | 107 |
this.request = Objects.requireNonNull(request);
|
| 108 | 108 |
this.changeModeProducer = Objects.requireNonNull(changeModeProducer);
|
| 109 | 109 |
this.executor = executor;
|
| ... | ... | @@ -229,6 +229,7 @@ public class ChangeMode<U extends ContentUI> extends ContentUIActionSupport<U> { |
| 229 | 229 |
setIcon(icon);
|
| 230 | 230 |
KeyStroke acceleratorKey = getAcceleratorKey();
|
| 231 | 231 |
if (!editable) {
|
| 232 |
+ removeKeyStrokeToText();
|
|
| 232 | 233 |
setKeyStroke(null);
|
| 233 | 234 |
}
|
| 234 | 235 |
updateToolTipText(tip);
|
| ... | ... | @@ -32,7 +32,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEdit |
| 32 | 32 |
import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUII18nHelper;
|
| 33 | 33 |
import fr.ird.observe.dto.data.DataDto;
|
| 34 | 34 |
|
| 35 |
-import javax.swing.JButton;
|
|
| 35 |
+import javax.swing.AbstractButton;
|
|
| 36 | 36 |
import java.awt.event.ActionEvent;
|
| 37 | 37 |
import java.util.Objects;
|
| 38 | 38 |
import java.util.function.BiConsumer;
|
| ... | ... | @@ -52,7 +52,7 @@ public final class MoveEdit<D extends DataDto, U extends ContentEditUI<D, U>> ex |
| 52 | 52 |
public static <D extends DataDto, U extends ContentEditUI<D, U>> void installAction(U ui, Supplier<MoveRequestBuilder.StepBuild> requestBuilderSupplier, Function<MoveRequest, BiConsumer<String, ImmutableSet<String>>> requestConsumer, Function<MoveRequest, MoveTreeAdapter> treeAdapter) {
|
| 53 | 53 |
MoveExecutor moveExecutor = new MoveExecutor(requestBuilderSupplier, requestConsumer, treeAdapter);
|
| 54 | 54 |
MoveEdit<D, U> action = new MoveEdit<>(ui.getModel().getSource().getScope().getMainType(), moveExecutor);
|
| 55 |
- init(ui, (JButton) Objects.requireNonNull(ui).getObjectById("move"), action);
|
|
| 55 |
+ init(ui, (AbstractButton) Objects.requireNonNull(ui).getObjectById("move"), action);
|
|
| 56 | 56 |
}
|
| 57 | 57 |
|
| 58 | 58 |
protected MoveEdit(Class<D> dataType, MoveExecutor executor) {
|
| ... | ... | @@ -34,6 +34,7 @@ public class CollapseAll extends NavigationConfigUIActionSupport { |
| 34 | 34 |
|
| 35 | 35 |
public CollapseAll() {
|
| 36 | 36 |
super(n("observe.ui.tree.action.collapseAll.tip"), "collapse", ObserveKeyStrokesEditorApi.KEY_STROKE_COLLAPSE_TREE_TABLE_NODE);
|
| 37 |
+ setText(null);
|
|
| 37 | 38 |
}
|
| 38 | 39 |
|
| 39 | 40 |
@Override
|
| ... | ... | @@ -34,6 +34,7 @@ public class ExpandAll extends NavigationConfigUIActionSupport { |
| 34 | 34 |
|
| 35 | 35 |
public ExpandAll() {
|
| 36 | 36 |
super(n("observe.ui.tree.action.expandAll.tip"), "expand", ObserveKeyStrokesEditorApi.KEY_STROKE_EXPAND_TREE_TABLE_NODE);
|
| 37 |
+ setText(null);
|
|
| 37 | 38 |
}
|
| 38 | 39 |
|
| 39 | 40 |
@Override
|
| ... | ... | @@ -51,6 +51,7 @@ public class GoDown extends NavigationConfigUIActionSupport implements ReloadAct |
| 51 | 51 |
|
| 52 | 52 |
public GoDown() {
|
| 53 | 53 |
super(n("observe.ui.action.goDown.tip"), "navigate-down", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_DOWN);
|
| 54 |
+ setText(null);
|
|
| 54 | 55 |
}
|
| 55 | 56 |
|
| 56 | 57 |
@Override
|
| ... | ... | @@ -48,6 +48,7 @@ public class GoNext extends NavigationConfigUIActionSupport implements ReloadAct |
| 48 | 48 |
|
| 49 | 49 |
public GoNext() {
|
| 50 | 50 |
super(n("observe.ui.tree.action.goNext.tip"), "navigate-next", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_NEXT);
|
| 51 |
+ setText(null);
|
|
| 51 | 52 |
}
|
| 52 | 53 |
|
| 53 | 54 |
@Override
|
| ... | ... | @@ -48,6 +48,7 @@ public class GoPrevious extends NavigationConfigUIActionSupport implements Reloa |
| 48 | 48 |
|
| 49 | 49 |
public GoPrevious() {
|
| 50 | 50 |
super(n("observe.ui.tree.action.goPrevious.tip"), "navigate-previous", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_PREVIOUS);
|
| 51 |
+ setText(null);
|
|
| 51 | 52 |
}
|
| 52 | 53 |
|
| 53 | 54 |
@Override
|
| ... | ... | @@ -49,6 +49,7 @@ public class GoUp extends NavigationConfigUIActionSupport implements ReloadActio |
| 49 | 49 |
|
| 50 | 50 |
public GoUp() {
|
| 51 | 51 |
super(n("observe.ui.action.goUp.tip"), "navigate-up", ObserveKeyStrokesEditorApi.KEY_STROKE_GO_UP);
|
| 52 |
+ setText(null);
|
|
| 52 | 53 |
}
|
| 53 | 54 |
|
| 54 | 55 |
@Override
|
| ... | ... | @@ -49,7 +49,7 @@ abstract class NavigationConfigUIActionSupport extends JComponentActionSupport<N |
| 49 | 49 |
}
|
| 50 | 50 |
|
| 51 | 51 |
NavigationConfigUIActionSupport(String shortDescription, String actionIcon, KeyStroke acceleratorKey) {
|
| 52 |
- super(null, shortDescription, actionIcon, acceleratorKey);
|
|
| 52 |
+ super("", shortDescription, actionIcon, acceleratorKey);
|
|
| 53 | 53 |
}
|
| 54 | 54 |
|
| 55 | 55 |
@Override
|
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 |
|
| 21 | 21 |
<fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingPartDto"
|
| 22 | 22 |
superGenericType='LandingDto, LandingPartDto, LandingPartUI'
|
| 23 |
- implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<LandingDto>'>
|
|
| 23 |
+ implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<LandingDto>, fr.ird.observe.client.datasource.editor.api.content.data.table.SortableTableUI'>
|
|
| 24 | 24 |
|
| 25 | 25 |
<import>
|
| 26 | 26 |
fr.ird.observe.dto.data.ll.landing.LandingDto
|
| ... | ... | @@ -174,5 +174,5 @@ |
| 174 | 174 |
</JPanel>
|
| 175 | 175 |
|
| 176 | 176 |
<Object id="delegateContentUI" initializer="mainTabbedPane"/>
|
| 177 |
- <ContentTableUIModelStates id='landingPartStates' genericType='LandingDto, LandingPartDto' initializer="getModel().getLandingPartUIModel().getStates()"/>
|
|
| 177 |
+ <ContentTableUIModelStates id='landingPartStates' genericType='LandingDto, LandingPartDto' initializer="landingPartUI.getModel().getStates()"/>
|
|
| 178 | 178 |
</fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI>
|
| ... | ... | @@ -28,9 +28,9 @@ |
| 28 | 28 |
enabled:{!states.isReadingMode()};
|
| 29 | 29 |
}
|
| 30 | 30 |
|
| 31 |
-#mainTabbedPane {
|
|
| 31 |
+/*#mainTabbedPane {
|
|
| 32 | 32 |
_focusComponent:{newComponentArray(dataSource,landingPartUI.getSpecies())};
|
| 33 |
-}
|
|
| 33 |
+}*/
|
|
| 34 | 34 |
|
| 35 | 35 |
#landingPartUI {
|
| 36 | 36 |
_tab:{"landingPartTab"};
|
| ... | ... | @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.landing; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer;
|
|
| 25 | 26 |
import fr.ird.observe.dto.data.ll.landing.LandingDto;
|
| 26 | 27 |
import fr.ird.observe.dto.referential.ll.landing.DataSourceReference;
|
| 27 | 28 |
|
| ... | ... | @@ -41,6 +42,12 @@ class LandingUIHandler extends GeneratedLandingUIHandler { |
| 41 | 42 |
dataSourceChanged = evt -> onDataSourceChanged((DataSourceReference) evt.getNewValue());
|
| 42 | 43 |
}
|
| 43 | 44 |
|
| 45 |
+ @Override
|
|
| 46 |
+ protected void onBeforeInit(LandingUI ui, ContentUIInitializer<LandingUI> initializer) {
|
|
| 47 |
+ LandingPartUIModel partUIModel = LandingPartUIModel.create(ui);
|
|
| 48 |
+ initializer.registerDependencies(partUIModel);
|
|
| 49 |
+ }
|
|
| 50 |
+ |
|
| 44 | 51 |
@Override
|
| 45 | 52 |
public void onInit(LandingUI ui) {
|
| 46 | 53 |
super.onInit(ui);
|
| ... | ... | @@ -61,7 +61,7 @@ |
| 61 | 61 |
</JPanel>
|
| 62 | 62 |
|
| 63 | 63 |
<Object id="delegateContentUI" initializer="samplePartPanel"/>
|
| 64 |
- <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="getModel().getSamplePartUIModel().getStates()"/>
|
|
| 64 |
+ <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="samplePartUI.getModel().getStates()"/>
|
|
| 65 | 65 |
|
| 66 | 66 |
<JMenuItem id='move' styleClass="ifOpen"/>
|
| 67 | 67 |
</fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEditUI>
|
| ... | ... | @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer;
|
|
| 25 | 26 |
import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequestBuilder;
|
| 26 | 27 |
import fr.ird.observe.client.datasource.editor.api.content.data.edit.ContentEditUILayoutFocusTraversalPolicy;
|
| 27 | 28 |
import fr.ird.observe.client.datasource.editor.api.content.data.edit.actions.MoveEdit;
|
| ... | ... | @@ -41,6 +42,11 @@ import java.awt.Container; |
| 41 | 42 |
* @since 3.8
|
| 42 | 43 |
*/
|
| 43 | 44 |
public class ActivitySampleUIHandler extends GeneratedActivitySampleUIHandler {
|
| 45 |
+ @Override
|
|
| 46 |
+ protected void onBeforeInit(ActivitySampleUI ui, ContentUIInitializer<ActivitySampleUI> initializer) {
|
|
| 47 |
+ SamplePartUIModel partUIModel = SamplePartUIModel.create(ui);
|
|
| 48 |
+ initializer.registerDependencies(partUIModel);
|
|
| 49 |
+ }
|
|
| 44 | 50 |
|
| 45 | 51 |
@Override
|
| 46 | 52 |
public void onInit(ActivitySampleUI ui) {
|
| ... | ... | @@ -57,6 +57,7 @@ public class SamplePartUIModel extends GeneratedSamplePartUIModel { |
| 57 | 57 |
public static SamplePartUIModel create(ActivitySampleUI parentUI) {
|
| 58 | 58 |
ActivitySampleUINavigationNode parentSource = ActivitySampleUI.getNavigationSource(parentUI);
|
| 59 | 59 |
SamplePartUINavigationNode node = parentSource.newTableNode(SamplePartUINavigationNode.class, parentSource.getParentReference());
|
| 60 |
+ node.setParent(parentSource);
|
|
| 60 | 61 |
return new SamplePartUIModel(node, parentUI.getBean());
|
| 61 | 62 |
}
|
| 62 | 63 |
|
| ... | ... | @@ -114,7 +115,6 @@ public class SamplePartUIModel extends GeneratedSamplePartUIModel { |
| 114 | 115 |
@Override
|
| 115 | 116 |
public void onAfterInitAddReferentialFilters(ClientConfig clientConfig, ObserveServicesProvider servicesProvider, ReferencesCache referenceCache) {
|
| 116 | 117 |
referenceCache.addReferentialFilter(SamplePartDto.PROPERTY_SPECIES, ReferencesFilterHelper.newLlSpeciesList(servicesProvider, getClientUIContext().getObserveSelectModel(), clientConfig.getSpeciesListLonglineLogbookSampleId()));
|
| 117 |
- |
|
| 118 | 118 |
}
|
| 119 | 119 |
|
| 120 | 120 |
public SampleUIModelSupport<SamplePartDto> getSupport() {
|
| ... | ... | @@ -97,5 +97,5 @@ |
| 97 | 97 |
</JPanel>
|
| 98 | 98 |
|
| 99 | 99 |
<Object id="delegateContentUI" initializer="mainTabbedPane"/>
|
| 100 |
- <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="getModel().getSamplePartUIModel().getStates()"/>
|
|
| 100 |
+ <ContentTableUIModelStates id='samplePartStates' genericType='SampleDto, SamplePartDto' initializer="samplePartUI.getModel().getStates()"/>
|
|
| 101 | 101 |
</fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI>
|
| ... | ... | @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.client.datasource.editor.api.content.ContentMode;
|
| 26 |
+import fr.ird.observe.client.datasource.editor.api.content.ContentUIInitializer;
|
|
| 26 | 27 |
import fr.ird.observe.client.datasource.editor.api.content.actions.move.tree.DefaultSingleMoveTreeAdapter;
|
| 27 | 28 |
import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUILayoutFocusTraversalPolicy;
|
| 28 | 29 |
import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.MoveOpenable;
|
| ... | ... | @@ -39,6 +40,11 @@ import java.awt.Container; |
| 39 | 40 |
* @since 3.8
|
| 40 | 41 |
*/
|
| 41 | 42 |
class SampleUIHandler extends GeneratedSampleUIHandler {
|
| 43 |
+ @Override
|
|
| 44 |
+ protected void onBeforeInit(SampleUI ui, ContentUIInitializer<SampleUI> initializer) {
|
|
| 45 |
+ SamplePartUIModel partUIModel = SamplePartUIModel.create(ui);
|
|
| 46 |
+ initializer.registerDependencies(partUIModel);
|
|
| 47 |
+ }
|
|
| 42 | 48 |
|
| 43 | 49 |
@Override
|
| 44 | 50 |
public void onInit(SampleUI ui) {
|
| ... | ... | @@ -40,7 +40,6 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl |
| 40 | 40 |
|
| 41 | 41 |
@Override
|
| 42 | 42 |
protected void onBeforeInit(SetGlobalCompositionUI ui, ContentUIInitializer<SetGlobalCompositionUI> initializer) {
|
| 43 |
- super.onBeforeInit(ui, initializer);
|
|
| 44 | 43 |
initializer.registerDependencies(
|
| 45 | 44 |
SetFloatlinesCompositionUIModel.create(ui),
|
| 46 | 45 |
SetBranchlinesCompositionUIModel.create(ui),
|
| ... | ... | @@ -96,7 +96,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition |
| 96 | 96 |
|
| 97 | 97 |
@Override
|
| 98 | 98 |
protected void onBeforeInit(SetDetailCompositionUI ui, ContentUIInitializer<SetDetailCompositionUI> initializer) {
|
| 99 |
- super.onBeforeInit(ui, initializer);
|
|
| 100 | 99 |
initializer.registerDependencies(BranchlineUIModel.create(ui));
|
| 101 | 100 |
}
|
| 102 | 101 |
|
| ... | ... | @@ -40,7 +40,6 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl |
| 40 | 40 |
|
| 41 | 41 |
@Override
|
| 42 | 42 |
protected void onBeforeInit(SetGlobalCompositionUI ui, ContentUIInitializer<SetGlobalCompositionUI> initializer) {
|
| 43 |
- super.onBeforeInit(ui, initializer);
|
|
| 44 | 43 |
initializer.registerDependencies(
|
| 45 | 44 |
SetFloatlinesCompositionUIModel.create(ui),
|
| 46 | 45 |
SetBranchlinesCompositionUIModel.create(ui),
|
| ... | ... | @@ -51,7 +51,6 @@ public class DiscardedTargetSampleUIHandler extends GeneratedDiscardedTargetSamp |
| 51 | 51 |
|
| 52 | 52 |
@Override
|
| 53 | 53 |
protected void onBeforeInit(DiscardedTargetSampleUI ui, ContentUIInitializer<DiscardedTargetSampleUI> initializer) {
|
| 54 |
- super.onBeforeInit(ui, initializer);
|
|
| 55 | 54 |
initializer.registerDependencies(sampleHandler = new TargetSampleImplHandler<>(ui));
|
| 56 | 55 |
}
|
| 57 | 56 |
|
| ... | ... | @@ -51,7 +51,6 @@ public class KeptTargetSampleUIHandler extends GeneratedKeptTargetSampleUIHandle |
| 51 | 51 |
|
| 52 | 52 |
@Override
|
| 53 | 53 |
protected void onBeforeInit(KeptTargetSampleUI ui, ContentUIInitializer<KeptTargetSampleUI> initializer) {
|
| 54 |
- super.onBeforeInit(ui, initializer);
|
|
| 55 | 54 |
sampleHandler = new TargetSampleImplHandler<>(ui);
|
| 56 | 55 |
initializer.registerDependencies(sampleHandler);
|
| 57 | 56 |
}
|
| ... | ... | @@ -39,7 +39,6 @@ public class NonTargetSampleUIHandler extends GeneratedNonTargetSampleUIHandler |
| 39 | 39 |
|
| 40 | 40 |
@Override
|
| 41 | 41 |
protected void onBeforeInit(NonTargetSampleUI ui, ContentUIInitializer<NonTargetSampleUI> initializer) {
|
| 42 |
- super.onBeforeInit(ui, initializer);
|
|
| 43 | 42 |
sampleHandler = new NonTargetSampleImplHandler(ui);
|
| 44 | 43 |
ui.setContextValue(sampleHandler);
|
| 45 | 44 |
}
|
| ... | ... | @@ -57,7 +57,6 @@ public class GenerateContentTableUIHandler extends GenerateContentTableUISupport |
| 57 | 57 |
public static final String NOT_STANDALONE_METHODS = "" +
|
| 58 | 58 |
" @Override\n" +
|
| 59 | 59 |
" protected void onBeforeInit(%1$s ui, ContentUIInitializer<%1$s> initializer) {\n" +
|
| 60 |
- " super.onBeforeInit(ui, initializer);\n" +
|
|
| 61 | 60 |
" EditableContentUI<%2$s> parentUI = initializer.getParentEditUI();\n" +
|
| 62 | 61 |
" %1$sModel model = parentUI.getContextValue(%1$sModel.class);\n" +
|
| 63 | 62 |
" initializer.registerDependencies(model, new %1$sTableModel(parentUI, ui, model));\n" +
|