From 6a68f814dedd964d7f7483cbcfacfdfef74e8976 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Thu, 1 Aug 2019 13:19:53 +0200 Subject: [PATCH] Bug 5085: Consistent naming --- ...TemplateMapping.java => FreestyleMarkConfiguration.java} | 6 +++--- ...emplateMapping.java => MarkPropertiesConfiguration.java} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/{FreestyleMarkTemplateMapping.java => FreestyleMarkConfiguration.java} (74%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/{MarkPropertiesMarkTemplateMapping.java => MarkPropertiesConfiguration.java} (90%) diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java similarity index 74% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java index 6e8a40c638f..a1041528e49 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.coursetemplate; /** - * Describes a mapping with an optional {@link #getMarkTemplate() mark template} that delivers + * Describes a configuration with an optional {@link #getMarkTemplate() mark template} that delivers * explicit {@link CommonMarkPropertiesWithOptionalPositioning}. The object can be marked for * adding to the inventory when applied. The {@link #getFreestyleProperties() freestyle properties} - * take precedence + * take precedence. * * @author Axel Uhl (D043530) * */ -public interface FreestyleMarkTemplateMapping extends MarkConfiguration { +public interface FreestyleMarkConfiguration extends MarkConfiguration { @Override MarkTemplate getMarkTemplate(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java similarity index 90% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java index 896b17dbfae..5c6fefdfffa 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java @@ -9,7 +9,7 @@ package com.sap.sailing.domain.coursetemplate; * @author Axel Uhl (D043530) * */ -public interface MarkPropertiesMarkTemplateMapping extends MarkConfiguration { +public interface MarkPropertiesConfiguration extends MarkConfiguration { @Override MarkTemplate getMarkTemplate();