Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
06c4e20f
by Tony CHEMIT at 2017-06-14T10:37:53+02:00
-
bbd61e13
by Tony CHEMIT at 2017-06-14T10:38:23+02:00
2 changed files:
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
- persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java
Changes:
| ... | ... | @@ -138,27 +138,25 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, |
| 138 | 138 |
|
| 139 | 139 |
FloatingObjectDto bean = getBean();
|
| 140 | 140 |
|
| 141 |
+ ImmutableSet<DataReference<FloatingObjectPartDto>> partsSet;
|
|
| 141 | 142 |
Form<FloatingObjectDto> form;
|
| 142 | 143 |
if (dcpId == null) {
|
| 143 | 144 |
|
| 144 | 145 |
// create mode
|
| 145 | 146 |
form = getFloatingObjectService().preCreate(activityId);
|
| 146 |
- |
|
| 147 |
+ partsSet = ImmutableSet.of();
|
|
| 147 | 148 |
} else {
|
| 148 | 149 |
|
| 149 | 150 |
// update mode
|
| 150 | 151 |
form = getFloatingObjectService().loadForm(dcpId);
|
| 151 |
- |
|
| 152 |
+ partsSet = getFloatingObjectService().getFloatingObjectPartByFloatingObject(dcpId).getReferences();
|
|
| 153 |
+ log.info(String.format("Load %d part(s).", partsSet.size()));
|
|
| 152 | 154 |
}
|
| 153 | 155 |
loadReferentialReferenceSetsInModel(form);
|
| 154 | 156 |
|
| 155 | 157 |
getModel().setForm(form);
|
| 156 | 158 |
FloatingObjectHelper.copyFloatingObjectDto(form.getObject(), bean);
|
| 157 | 159 |
|
| 158 |
- ImmutableSet<DataReference<FloatingObjectPartDto>> partsSet = getFloatingObjectService().getFloatingObjectPartByFloatingObject(dcpId).getReferences();
|
|
| 159 |
- |
|
| 160 |
- log.info(String.format("Load %d part(s).", partsSet.size()));
|
|
| 161 |
- |
|
| 162 | 160 |
getModel().reset();
|
| 163 | 161 |
|
| 164 | 162 |
openTable(partsSet, getUi().getSimpleTable());
|
| ... | ... | @@ -65,13 +65,14 @@ public final class ObserveMigrationConfigurationProvider { |
| 65 | 65 |
for (Class<?> type : types) {
|
| 66 | 66 |
Version version = getVersion(type);
|
| 67 | 67 |
builder.put(version, type);
|
| 68 |
- if (log.isInfoEnabled()) {
|
|
| 69 |
- log.info("Found migration version: " + version);
|
|
| 68 |
+ if (log.isDebugEnabled()) {
|
|
| 69 |
+ log.debug("Found migration version: " + version);
|
|
| 70 | 70 |
}
|
| 71 | 71 |
}
|
| 72 | 72 |
migrationForVersionTypes = ImmutableMap.copyOf(builder);
|
| 73 | 73 |
|
| 74 | 74 |
}
|
| 75 |
+ log.info(String.format("Found %d migration version(s).", migrationForVersionTypes.size()));
|
|
| 75 | 76 |
return migrationForVersionTypes;
|
| 76 | 77 |
}
|
| 77 | 78 |
|