From d339051449aca3a5ebd5ef87060f5aef978d1303 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 14 Jul 2007 19:11:37 +0000
Subject: [PATCH] fixing a merge failure.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3703 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/AbstractBuild.java            | 2 +-
 core/src/main/java/hudson/model/DirectoryBrowserSupport.java  | 2 +-
 core/src/main/java/hudson/model/Node.java                     | 2 +-
 core/src/main/java/hudson/model/PeriodicWork.java             | 2 +-
 core/src/main/java/hudson/model/Slave.java                    | 4 ++--
 .../org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 51ea34a81c..3ef355e4e0 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -42,7 +42,7 @@ import java.util.ArrayList;
 public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends AbstractBuild<P,R>> extends Run<P,R> implements Queue.Executable {
 
     /**
-     * PluginName of the slave this project was built on.
+     * Name of the slave this project was built on.
      * Null or "" if built by the master. (null happens when we read old record that didn't have this information.)
      */
     private String builtOn;
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 3664001e93..79364f8cae 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -168,7 +168,7 @@ public final class DirectoryBrowserSupport {
          */
         private final String href;
         /**
-         * PluginName of this path. Just the file name portion.
+         * Name of this path. Just the file name portion.
          */
         private final String title;
 
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
index 3fb1083c29..34682c339b 100644
--- a/core/src/main/java/hudson/model/Node.java
+++ b/core/src/main/java/hudson/model/Node.java
@@ -14,7 +14,7 @@ import java.util.Set;
  */
 public interface Node {
     /**
-     * PluginName of this node.
+     * Name of this node.
      *
      * @return
      *      "" if this is master
diff --git a/core/src/main/java/hudson/model/PeriodicWork.java b/core/src/main/java/hudson/model/PeriodicWork.java
index 72af80af53..fad06ad62d 100644
--- a/core/src/main/java/hudson/model/PeriodicWork.java
+++ b/core/src/main/java/hudson/model/PeriodicWork.java
@@ -12,7 +12,7 @@ import java.util.logging.Logger;
 public abstract class PeriodicWork extends TimerTask {
 
     /**
-     * PluginName of the work.
+     * Name of the work.
      */
     private final String name;
     private Thread thread;
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index e91c94fd67..8169ba4720 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -49,7 +49,7 @@ import java.util.logging.Logger;
  */
 public final class Slave implements Node, Serializable {
     /**
-     * PluginName of this slave node.
+     * Name of this slave node.
      */
     protected final String name;
 
@@ -108,7 +108,7 @@ public final class Slave implements Node, Serializable {
         getAssignedLabels();    // compute labels now
 
         if (name.equals(""))
-            throw new FormException("Invalid slave configuration. PluginName is empty", null);
+            throw new FormException("Invalid slave configuration. Name is empty", null);
 
         // this prevents the config from being saved when slaves are offline.
         // on a large deployment with a lot of slaves, some slaves are bound to be offline,
diff --git a/core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
index 1215e52be1..41b41f9dfe 100644
--- a/core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
+++ b/core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
@@ -55,7 +55,7 @@ import java.util.Vector;
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> msg <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
  * <FONT color=#0000ff>&lt;!-- File changed --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> file <FONT color=#ff00ff>(name,revision,prevrevision</FONT><FONT color=#ff00ff>?</FONT><FONT color=#ff00ff>)</FONT><FONT color=#6a5acd>&gt;</FONT>
- * <FONT color=#0000ff>&lt;!-- PluginName of the file --&gt;</FONT>
+ * <FONT color=#0000ff>&lt;!-- Name of the file --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> name <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
  * <FONT color=#0000ff>&lt;!-- Revision number --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> revision <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
-- 
GitLab