From fc1baf1bfd8ecc12ffa6f0eedce47ce9bfb44250 Mon Sep 17 00:00:00 2001 From: Ikram Maalej Date: Mon, 10 Jan 2022 15:28:21 +0100 Subject: [PATCH] Code improvement --- .../forms/createprocess/CreateProcessForm.java | 13 ++++++++----- .../forms/createprocess/ProcessBooleanMetadata.java | 5 ++--- .../forms/createprocess/ProcessDetail.java | 12 +++++++++--- .../forms/createprocess/ProcessFieldedMetadata.java | 4 ++-- .../forms/createprocess/ProcessMetadata.java | 2 +- .../forms/createprocess/ProcessSelectMetadata.java | 2 +- .../forms/createprocess/ProcessTextMetadata.java | 2 +- .../production/forms/dataeditor/DataEditorForm.java | 3 +-- .../production/services/data/ImportService.java | 2 +- .../main/resources/messages/messages_de.properties | 2 +- .../main/webapp/WEB-INF/resources/css/kitodo.css | 4 ++-- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java index b6142ce215f..2b826957de3 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java @@ -606,7 +606,8 @@ public String getReferringView() { */ public boolean canBeAdded(TreeNode treeNode) throws InvalidMetadataValueException { if (Objects.isNull(treeNode.getParent().getParent())) { - if (Objects.nonNull(processMetadata.getSelectedMetadataTreeNode()) || Objects.isNull(addMetadataDialog.getAddableMetadata())) { + if (Objects.nonNull(processMetadata.getSelectedMetadataTreeNode()) + || Objects.isNull(addMetadataDialog.getAddableMetadata())) { this.addMetadataDialog.prepareAddableMetadataForStructure(); } } else if (!Objects.equals(processMetadata.getSelectedMetadataTreeNode(), treeNode.getParent()) @@ -614,8 +615,11 @@ public boolean canBeAdded(TreeNode treeNode) throws InvalidMetadataValueExceptio prepareAddableMetadataForGroup(treeNode.getParent()); } if (Objects.nonNull(addMetadataDialog.getAddableMetadata())) { - return addMetadataDialog.getAddableMetadata().stream() - .map(SelectItem::getValue).collect(Collectors.toList()).contains(((ProcessDetail) treeNode.getData()).getMetadataID()); + return addMetadataDialog.getAddableMetadata() + .stream() + .map(SelectItem::getValue) + .collect(Collectors.toList()) + .contains(((ProcessDetail) treeNode.getData()).getMetadataID()); } return false; } @@ -636,9 +640,8 @@ public boolean canBeDeleted(ProcessDetail processDetail) { public boolean metadataAddableToGroup(TreeNode metadataNode) { if (metadataNode.getData() instanceof ProcessFieldedMetadata) { return !(DataEditorService.getAddableMetadataForGroup(getMainProcess().getRuleset(), metadataNode).isEmpty()); - } else { - return false; } + return false; } /** diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java index 9a84b85674c..8545b0db8b9 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessBooleanMetadata.java @@ -71,7 +71,7 @@ public String getInput() { } @Override - public Collection getMetadata() throws InvalidMetadataValueException { + public Collection getMetadataWithFilledValues() throws InvalidMetadataValueException { return getMetadata(true); } @@ -87,9 +87,8 @@ public Collection getMetadata(boolean skipEmpty) throws InvalidMetadat entry.setDomain(DOMAIN_TO_MDSEC.get(settings.getDomain().orElse(Domain.DESCRIPTION))); entry.setValue(value.isPresent() ? value.get() : ""); return Collections.singletonList(entry); - } else { - return Collections.emptyList(); } + return Collections.emptyList(); } @Override diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessDetail.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessDetail.java index 13272f09edd..f175a4f0c98 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessDetail.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessDetail.java @@ -99,7 +99,6 @@ public String getLabel() { return label; } - /** * Returns the metadata from this row, as far as it has to be stored in the * collection obtainable from {@link LogicalDivision#getMetadata()}. @@ -108,8 +107,15 @@ public String getLabel() { * @throws InvalidMetadataValueException * if the metadata form contains syntactically wrong input */ - public abstract Collection getMetadata() throws InvalidMetadataValueException; - + public abstract Collection getMetadataWithFilledValues() throws InvalidMetadataValueException; + + /** + * Returns the metadata from this row. + * @param skipEmpty boolean to filter metadata with empty value or not. + * @return the metadata from this row + * @throws InvalidMetadataValueException + * if the metadata form contains syntactically wrong input + */ public abstract Collection getMetadata(boolean skipEmpty) throws InvalidMetadataValueException; /** diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java index 0572e1cb2fb..9e8b6fa6a6f 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java @@ -451,7 +451,7 @@ public String getInput() { * if some value is invalid */ @Override - public Collection getMetadata() throws InvalidMetadataValueException { + public Collection getMetadataWithFilledValues() throws InvalidMetadataValueException { return getMetadata(true); } @@ -551,7 +551,7 @@ public void preserve() throws InvalidMetadataValueException, NoSuchMetadataField if (Objects.nonNull(metsFieldValue)) { metsFieldValue.getKey().accept(division, metsFieldValue.getValue()); } else { - metadata.addAll(row.getMetadata()); + metadata.addAll(row.getMetadataWithFilledValues()); } } if (Objects.nonNull(hiddenMetadata)) { diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessMetadata.java index 9364b367be3..d70a5582155 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessMetadata.java @@ -135,7 +135,7 @@ public boolean metadataAddableToStructureElement() throws InvalidMetadataValueEx } /** - * Adds an empty table line with the given type. + * Adds an empty table line with 'addMetadataKeySelectedItem' type. */ public void addMetadataEntry() { try { diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java index 5cf251f6988..27535b9f0e9 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessSelectMetadata.java @@ -112,7 +112,7 @@ public List getItems() { } @Override - public Collection getMetadata() throws InvalidMetadataValueException { + public Collection getMetadataWithFilledValues() throws InvalidMetadataValueException { return getMetadata(true); } diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java index 9734a6cc9a9..2fe4b9e927f 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessTextMetadata.java @@ -94,7 +94,7 @@ public Collection getMetadata(boolean skipEmpty) { } @Override - public Collection getMetadata() { + public Collection getMetadataWithFilledValues() { return getMetadata(true); } diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java index 18ea58b9c01..3171bdd8bd0 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java @@ -859,9 +859,8 @@ public boolean canBeAdded(TreeNode treeNode) { if (Objects.nonNull(addMetadataDialog.getAddableMetadata())) { return addMetadataDialog.getAddableMetadata().stream() .map(SelectItem::getValue).collect(Collectors.toList()).contains(((ProcessDetail) treeNode.getData()).getMetadataID()); - } else { - return false; } + return false; } @Override diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java index 6f5ba2560b0..e9092c5b3c4 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java @@ -1104,7 +1104,7 @@ public static void addProperties(Process process, Template template, List processDetailList, Process process) { try { for (ProcessDetail processDetail : processDetailList) { - Collection processMetadata = processDetail.getMetadata(); + Collection processMetadata = processDetail.getMetadataWithFilledValues(); if (!processMetadata.isEmpty() && processMetadata.toArray()[0] instanceof Metadata) { String metadataValue = ImportService.getProcessDetailValue(processDetail); Metadata metadata = (Metadata) processMetadata.toArray()[0]; diff --git a/Kitodo/src/main/resources/messages/messages_de.properties b/Kitodo/src/main/resources/messages/messages_de.properties index 211a243caf5..ee88aca9960 100644 --- a/Kitodo/src/main/resources/messages/messages_de.properties +++ b/Kitodo/src/main/resources/messages/messages_de.properties @@ -580,7 +580,7 @@ messages=Nachrichten metadata=Metadaten metadataCorrupt=Die Metadatendatei ist fehlerhaft, bitte informieren Sie ihren Administrator. metadataDelete=Metadaten l\u00F6schen -metadataDeleteNotAllowed=Metadaten ist in Regelsatz als 'Required' oder "alwaysShowing" konfiguriert +metadataDeleteNotAllowed=Metadatum ist in Regelsatz als 'Required' oder "alwaysShowing" konfiguriert metadataDoesNotEndWith=endet nicht mit dem Wert metadataDoesNotStartWith=startet nicht mit dem Wert metadataDuplicate=Metadaten duplizieren diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css index 675f7e933c7..246dd5beb64 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css +++ b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css @@ -1304,11 +1304,11 @@ Import form } #editForm\:processFromTemplateTabView\:metadataTable tr.ui-widget-content:not([data-prk='root']) span > .ui-inputfield.hasDatepicker { - width: calc(50% - 4 * var(--default-half-size) - 93px - 39px); + width: calc(50% - 172px); } #editForm\:processFromTemplateTabView\:metadataTable tr.ui-widget-content span > .ui-inputfield.hasDatepicker { - width: calc(50% - var(--default-half-size) - 93px - 39px); + width: calc(50% - 140px); } #editForm\:processFromTemplateTabView\:metadataTable div.ui-selectmanymenu + span,