Rename MediaPartialViewsPanel to MediaPartialsPanel

markusweigelt · Nov 16, 2023 · b472a5c · b472a5c
1 parent 62c8e53
commit b472a5c
Showing 5 changed files with 29 additions and 30 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/GalleryPanel.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/GalleryPanel.java
@@ -88,7 +88,7 @@ public class GalleryPanel {
             "imagePreviewForm:unstructuredMediaList:(\\d+):unstructuredPageLastDropArea");
 
     private final DataEditorForm dataEditor;
-    private final MediaPartialViewsPanel mediaPartialViewsPanel;
+    private final MediaPartialsPanel mediaPartialsPanel;
     private GalleryViewMode galleryViewMode = GalleryViewMode.LIST;
     private List<GalleryMediaContent> medias = Collections.emptyList();
 
@@ -107,7 +107,7 @@ public class GalleryPanel {
 
     GalleryPanel(DataEditorForm dataEditor) {
         this.dataEditor = dataEditor;
-        this.mediaPartialViewsPanel = new MediaPartialViewsPanel(dataEditor);
+        this.mediaPartialsPanel = new MediaPartialsPanel(dataEditor);
     }
 
     String getAcquisitionStage() {
@@ -1029,7 +1029,7 @@ public boolean hasMediaViewMimeTypePrefix(String mimeTypePrefix) {
         return false;
     }
 
-    public MediaPartialViewsPanel getMediaPartialViewsPanel() {
-        return mediaPartialViewsPanel;
+    public MediaPartialsPanel getMediaPartialsPanel() {
+        return mediaPartialsPanel;
     }
 }
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/MediaPartialForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/MediaPartialForm.java
@@ -28,8 +28,8 @@
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import static org.kitodo.production.forms.dataeditor.MediaPartialViewsPanel.generateExtentAndSortMediaPartials;
-import static org.kitodo.production.forms.dataeditor.MediaPartialViewsPanel.getMillisecondsOfFormattedTime;
+import static org.kitodo.production.forms.dataeditor.MediaPartialsPanel.generateExtentAndSortMediaPartials;
+import static org.kitodo.production.forms.dataeditor.MediaPartialsPanel.getMillisecondsOfFormattedTime;
 
 public class MediaPartialForm implements Serializable {
 
@@ -66,15 +66,15 @@ public boolean valid() {
             validationError = Helper.getTranslation("mediaPartialFormNoMedium");
             return false;
         }
-        validationError = dataEditor.getGalleryPanel().getMediaPartialViewsPanel().validateDuration();
+        validationError = dataEditor.getGalleryPanel().getMediaPartialsPanel().validateDuration();
         if (Objects.nonNull(validationError)) {
             return false;
         }
         if (StringUtils.isEmpty(getBegin())) {
             validationError = Helper.getTranslation("mediaPartialFormStartEmpty");
             return false;
         }
-        if (!Pattern.compile(MediaPartialViewsPanel.FORMATTED_TIME_REGEX).matcher(getBegin()).matches()) {
+        if (!Pattern.compile(MediaPartialsPanel.FORMATTED_TIME_REGEX).matcher(getBegin()).matches()) {
             validationError = Helper.getTranslation("mediaPartialFormStartWrongTimeFormat");
             return false;
         }
@@ -180,10 +180,10 @@ public void setType(String type) {
     }
 
     private String getDuration() {
-        return dataEditor.getGalleryPanel().getMediaPartialViewsPanel().getDuration();
+        return dataEditor.getGalleryPanel().getMediaPartialsPanel().getDuration();
     }
 
     private Pair<PhysicalDivision, LogicalDivision> getMediaSelection() {
-        return dataEditor.getGalleryPanel().getMediaPartialViewsPanel().getMediaSelection();
+        return dataEditor.getGalleryPanel().getMediaPartialsPanel().getMediaSelection();
     }
 }
diff --git a/...ms/dataeditor/MediaPartialViewsPanel.java → .../forms/dataeditor/MediaPartialsPanel.java b/...ms/dataeditor/MediaPartialViewsPanel.java → .../forms/dataeditor/MediaPartialsPanel.java
@@ -29,7 +29,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 
-import com.sun.xml.bind.marshaller.Messages;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.kitodo.api.dataeditor.rulesetmanagement.FunctionalDivision;
@@ -44,7 +43,7 @@
 
 
 
-public class MediaPartialViewsPanel implements Serializable {
+public class MediaPartialsPanel implements Serializable {
 
     public static final String FORMATTED_TIME_REGEX = "(([0-1][0-9])|([2][0-3])):([0-5][0-9]):([0-5][0-9])";
     public static final String REQUEST_PARAMETER_DURATION = "duration";
@@ -53,7 +52,7 @@ public class MediaPartialViewsPanel implements Serializable {
     private String duration;
     private Pair<PhysicalDivision, LogicalDivision> mediaSelection;
 
-    MediaPartialViewsPanel(DataEditorForm dataEditor) {
+    MediaPartialsPanel(DataEditorForm dataEditor) {
         this.dataEditor = dataEditor;
         mediaPartialForm = new MediaPartialForm(dataEditor);
     }
@@ -96,7 +95,7 @@ public String validateDuration() {
         String errorMessage = null;
         if (StringUtils.isEmpty(getDuration())) {
             errorMessage = Helper.getTranslation("mediaPartialFormMediaDurationEmpty");
-        } else if (!Pattern.compile(MediaPartialViewsPanel.FORMATTED_TIME_REGEX).matcher(getDuration()).matches()) {
+        } else if (!Pattern.compile(MediaPartialsPanel.FORMATTED_TIME_REGEX).matcher(getDuration()).matches()) {
             errorMessage = Helper.getTranslation("mediaPartialFormMediaDurationWrongTimeFormat");
         }
         return errorMessage;

diff --git a/...o/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMediaPartial.xhtml b/...o/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMediaPartial.xhtml
@@ -27,40 +27,40 @@
         <h:form id="mediaPartialForm">
             <p:panelGrid columns="1" layout="grid">
                 <p:row>
-                    <h3>#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.isEdit() ? msgs.editMediaPartial : msgs.addMediaPartial}</h3>
+                    <h3>#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.isEdit() ? msgs.editMediaPartial : msgs.addMediaPartial}</h3>
                     <h:panelGroup id="errorWrapper"
-                                  rendered="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.hasValidationError()}">
+                                  rendered="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.hasValidationError()}">
                         <h:panelGroup layout="block"
                                       styleClass="select-note ui-messages-error">
                             <h:outputText
-                                    value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.validationError}"/>
+                                    value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.validationError}"/>
                         </h:panelGroup>
                     </h:panelGroup>
                     <p:outputPanel styleClass="dialogFieldWrapper">
 
                         <p:outputPanel
-                                styleClass="#{(DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialDivisions.size() gt 1)?'':'hidden'}">
+                                styleClass="#{(DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialDivisions.size() gt 1)?'':'hidden'}">
                             <p:outputLabel for="type" value="Typ"/>
-                            <p:selectOneMenu id="type" value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.type}">
-                                <f:selectItems value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialDivisions}"/>
+                            <p:selectOneMenu id="type" value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.type}">
+                                <f:selectItems value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialDivisions}"/>
                             </p:selectOneMenu>
                         </p:outputPanel>
                         <p:outputPanel>
                             <p:outputLabel for="titleInput" value="#{msgs.title}"/>
                             <p:inputText id="titleInput" class="input"
-                                         value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.title}"/>
+                                         value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.title}"/>
                         </p:outputPanel>
                         <p:outputPanel>
                             <p:outputLabel for="beginInput" value="#{msgs.start}"/>
                             <p:inputText id="beginInput" class="input"
-                                         value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.begin}"/>
+                                         value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.begin}"/>
                         </p:outputPanel>
                     </p:outputPanel>
 
                     <h:panelGroup layout="block"
                                   styleClass="dialogButtonWrapper">
                         <p:commandButton id="addMediaPartialButton"
-                                         action="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.save}"
+                                         action="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.save}"
                                          value="#{msgs.apply}"
                                          update="@form"
                                          styleClass="primary right"/>

diff --git a/.../WEB-INF/templates/includes/metadataEditor/partials/media-detail-media-partial-list.xhtml b/.../WEB-INF/templates/includes/metadataEditor/partials/media-detail-media-partial-list.xhtml
@@ -20,16 +20,16 @@
         xmlns:a="http://xmlns.jcp.org/jsf/passthrough">
 
     <h:panelGroup id="mediaDetailMediaPartialsContainer" layout="block"
-                  rendered="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.enabled}">
+                  rendered="#{DataEditorForm.galleryPanel.mediaPartialsPanel.enabled}">
 
         <ui:fragment>
             <p:remoteCommand name="setMediaPartialsViewsPanelMembers"
-                             action="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.setMembersByRequestParameter()}"/>
+                             action="#{DataEditorForm.galleryPanel.mediaPartialsPanel.setMembersByRequestParameter()}"/>
 
             <p:outputPanel id="mediaPartialList"
-                           rendered="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialViewDivisions.size() > 0}">
+                           rendered="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialViewDivisions.size() > 0}">
                 <p:dataList
-                        value="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialViewDivisions}"
+                        value="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialViewDivisions}"
                         var="mediaPartialDivision"
                         type="ordered">
 
@@ -57,12 +57,12 @@
                                                  onclick="metadataEditor.gallery.mediaPartial.togglePlay(this, '#{mediaPartialDivision.value.begin}', '#{mediaPartialDivision.value.extent}')"/>
                                 <p:commandButton styleClass="editMediaView secondary"
                                                  onstart="metadataEditor.gallery.mediaPartial.setDuration()"
-                                                 action="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.editMediaViewDivision(mediaPartialDivision)}"
+                                                 action="#{DataEditorForm.galleryPanel.mediaPartialsPanel.editMediaViewDivision(mediaPartialDivision)}"
                                                  icon="fa fa-pencil-square-o"
                                                  oncomplete="PF('addMediaPartialDialog').show();"/>
                                 <p:commandButton styleClass="deleteMediaView secondary"
                                                  onstart="metadataEditor.gallery.mediaPartial.setDuration()"
-                                                 action="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.deleteMediaViewDivision(mediaPartialDivision)}"
+                                                 action="#{DataEditorForm.galleryPanel.mediaPartialsPanel.deleteMediaViewDivision(mediaPartialDivision)}"
                                                  update="imagePreviewForm:mediaPartialList,imagePreviewForm:thumbnailStripe,metadataAccordion:logicalMetadataWrapperPanel,logicalTree,physicalTree"
                                                  icon="fa fa-trash"/>
                             </p:outputPanel>
@@ -74,7 +74,7 @@
             <p:commandButton id="addMediaPartial"
                              icon="fa fa-plus"
                              onstart="metadataEditor.gallery.mediaPartial.setDuration()"
-                             action="#{DataEditorForm.galleryPanel.mediaPartialViewsPanel.mediaPartialForm.clean}"
+                             action="#{DataEditorForm.galleryPanel.mediaPartialsPanel.mediaPartialForm.clean}"
                              styleClass="secondary"
                              oncomplete="PF('addMediaPartialDialog').show();">
             </p:commandButton>