From 2f301c0117482cdcb86d73efabdf2cefdddbf3df Mon Sep 17 00:00:00 2001
From: Parichay Barpanda <parichay.barpanda@gmail.com>
Date: Sat, 4 Apr 2020 03:33:01 +0530
Subject: [PATCH] Modify skip notif trait classname and symbol to avoid
 conflicts (#79)

---
 ...ationsTrait.java => GitLabSkipNotificationsTrait.java} | 8 ++++----
 .../plugins/gitlabbranchsource/Messages.properties        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/main/java/io/jenkins/plugins/gitlabbranchsource/{SkipNotificationsTrait.java => GitLabSkipNotificationsTrait.java} (85%)

diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/SkipNotificationsTrait.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSkipNotificationsTrait.java
similarity index 85%
rename from src/main/java/io/jenkins/plugins/gitlabbranchsource/SkipNotificationsTrait.java
rename to src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSkipNotificationsTrait.java
index 76ed48a7..49c46554 100644
--- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/SkipNotificationsTrait.java
+++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/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
index 90cbaa51..4ddd9519 100644
--- 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