Modify skip notif trait classname and symbol to avoid conflicts (#79)

jenkinsci · Apr 3, 2020 · 2f301c0 · 2f301c0
1 parent 79f9dcf
commit 2f301c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...bbranchsource/SkipNotificationsTrait.java → ...hsource/GitLabSkipNotificationsTrait.java b/...bbranchsource/SkipNotificationsTrait.java → ...hsource/GitLabSkipNotificationsTrait.java
@@ -9,13 +9,13 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-public class SkipNotificationsTrait extends SCMSourceTrait {
+public class GitLabSkipNotificationsTrait extends SCMSourceTrait {
 
     /**
      * Constructor for stapler.
      */
     @DataBoundConstructor
-    public SkipNotificationsTrait() {
+    public GitLabSkipNotificationsTrait() {
         //empty
     }
 
@@ -31,13 +31,13 @@ protected void decorateContext(SCMSourceContext<?, ?> context) {
      * Our descriptor.
      */
     @Extension
-    @Symbol("skipNotifications")
+    @Symbol("gitlabSkipNotifications")
     public static class DescriptorImpl extends SCMSourceTraitDescriptor {
 
         @NonNull
         @Override
         public String getDisplayName() {
-            return Messages.SkipNotificationsTrait_displayName();
+            return Messages.GitLabSkipNotificationsTrait_displayName();
         }
 
         @Override

diff --git a/src/main/resources/io/jenkins/plugins/gitlabbranchsource/Messages.properties b/src/main/resources/io/jenkins/plugins/gitlabbranchsource/Messages.properties
@@ -48,7 +48,7 @@ HookRegistrationTrait.disable=Disable {0} management
 HookRegistrationTrait.displayName=Override GitLab hook management modes
 HookRegistrationTrait.useItem=Use Item credentials for {0} management
 HookRegistrationTrait.useSystem=Use System credentials for {0} management mode (default)
-SkipNotificationsTrait.displayName=Skip pipeline status notifications
+GitLabSkipNotificationsTrait.displayName=Skip pipeline status notifications
 GitLabAvatarTrait.displayName=Disable GitLab project avatars
 LogCommentTrait.displayName=Log build status as comment on GitLab
 TriggerMRCommentTrait.displayName=Trigger build on merge request comment