From 46d343e79efa2b5b7f42d044155a81e25d6c896f Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 6 Nov 2021 14:34:52 +0100 Subject: [PATCH] Fixed some typos. --- .../java/org/librecms/pages/models/AudioAssetModel.java | 2 +- .../org/librecms/pages/models/AudioAssetModelBuilder.java | 6 +++++- .../org/librecms/pages/models/BinaryAssetModelBuilder.java | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModel.java b/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModel.java index 4169dbb32..5a6919c7a 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModel.java +++ b/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModel.java @@ -24,7 +24,7 @@ import org.librecms.assets.AudioAsset; * * @author Jens Pelzetter */ -public class AudioAssetModel extends AbstractAssetModel { +public class AudioAssetModel extends BinaryAssetModel { private LegalMetadataModel legalMetadata; diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModelBuilder.java index 499899b4f..be22f0c80 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModelBuilder.java +++ b/ccm-cms/src/main/java/org/librecms/pages/models/AudioAssetModelBuilder.java @@ -28,7 +28,10 @@ import javax.transaction.Transactional; * @author Jens Pelzetter */ public class AudioAssetModelBuilder - extends BinaryAssetModelBuilder { + extends AbstractAssetModelBuilder { + + @Inject + private BinaryAssetModelBuilder binaryAssetModelBuilder; @Inject private LegalMetadataModelBuilder legalMetadataModelBuilder; @@ -49,6 +52,7 @@ public class AudioAssetModelBuilder final AudioAsset asset, final AudioAssetModel model ) { super.addProperties(asset, model); + binaryAssetModelBuilder.addProperties(asset, model); model.setLegalMetadata( legalMetadataModelBuilder.buildAssetModel(asset.getLegalMetadata()) ); diff --git a/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModelBuilder.java b/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModelBuilder.java index f4cdf0de6..07dde0c50 100644 --- a/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModelBuilder.java +++ b/ccm-cms/src/main/java/org/librecms/pages/models/BinaryAssetModelBuilder.java @@ -22,6 +22,7 @@ import org.libreccm.l10n.GlobalizationHelper; import org.librecms.assets.BinaryAsset; import org.librecms.contentsection.AssetManager; +import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.transaction.Transactional; @@ -29,6 +30,7 @@ import javax.transaction.Transactional; * * @author Jens Pelzetter */ +@RequestScoped public class BinaryAssetModelBuilder extends AbstractAssetModelBuilder {