| author | akozak | 2011-11-22 06:23:43 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:46:55 (EST) |
| commit | 2a9f3bf32b00f87a201124af4f2051c6fe69d330 (patch) (side-by-side diff) | |
| tree | c3411df7760beb724240f752204d6b87ad87398d | |
| parent | ff323d2eb7c0136e7522a103bb256102ea7e49e3 (diff) | |
| download | org.eclipse.hudson.core-2a9f3bf32b00f87a201124af4f2051c6fe69d330.zip org.eclipse.hudson.core-2a9f3bf32b00f87a201124af4f2051c6fe69d330.tar.gz org.eclipse.hudson.core-2a9f3bf32b00f87a201124af4f2051c6fe69d330.tar.bz2 | |
Rename *Property to *ProjectProperty
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/BaseProjectProperty.java (renamed from hudson-core/src/main/java/hudson/model/BaseProperty.java) | 4 | ||||
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/BooleanProjectProperty.java (renamed from hudson-core/src/main/java/hudson/model/BooleanProperty.java) | 2 | ||||
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/IntegerProjectProperty.java (renamed from hudson-core/src/main/java/hudson/model/IntegerProperty.java) | 2 | ||||
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/Job.java | 28 | ||||
| -rw-r--r-- | hudson-core/src/main/java/hudson/model/StringProjectProperty.java (renamed from hudson-core/src/main/java/hudson/model/StringProperty.java) | 2 | ||||
| -rw-r--r-- | hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java | 4 | ||||
| -rw-r--r-- | hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java (renamed from hudson-core/src/main/java/org/eclipse/hudson/api/model/IProperty.java) | 2 |
7 files changed, 22 insertions, 22 deletions
diff --git a/hudson-core/src/main/java/hudson/model/BaseProperty.java b/hudson-core/src/main/java/hudson/model/BaseProjectProperty.java index aa0278e..63cdeb1 100644 --- a/hudson-core/src/main/java/hudson/model/BaseProperty.java +++ b/hudson-core/src/main/java/hudson/model/BaseProjectProperty.java @@ -16,7 +16,7 @@ package hudson.model; import org.eclipse.hudson.api.model.IJob; -import org.eclipse.hudson.api.model.IProperty; +import org.eclipse.hudson.api.model.IProjectProperty; /** * Base property implementation. Contains common methods for setting and getting cascading and overridden properties. @@ -25,7 +25,7 @@ import org.eclipse.hudson.api.model.IProperty; * * @author Nikita Levyankov */ -public abstract class BaseProperty<T> implements IProperty<T> { +public abstract class BaseProjectProperty<T> implements IProjectProperty<T> { private String propertyKey; private transient IJob job; diff --git a/hudson-core/src/main/java/hudson/model/BooleanProperty.java b/hudson-core/src/main/java/hudson/model/BooleanProjectProperty.java index dd44767..1f5b077 100644 --- a/hudson-core/src/main/java/hudson/model/BooleanProperty.java +++ b/hudson-core/src/main/java/hudson/model/BooleanProjectProperty.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.ObjectUtils; * * @author Nikita Levyankov */ -public class BooleanProperty extends BaseProperty<Boolean> { +public class BooleanProjectProperty extends BaseProjectProperty<Boolean> { /** * {@inheritDoc} diff --git a/hudson-core/src/main/java/hudson/model/IntegerProperty.java b/hudson-core/src/main/java/hudson/model/IntegerProjectProperty.java index 3298a8a..eec756c 100644 --- a/hudson-core/src/main/java/hudson/model/IntegerProperty.java +++ b/hudson-core/src/main/java/hudson/model/IntegerProjectProperty.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.ObjectUtils; * * @author Nikita Levyankov */ -public class IntegerProperty extends BaseProperty<Integer> { +public class IntegerProjectProperty extends BaseProjectProperty<Integer> { /** * {@inheritDoc} */ diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java index 47834ac..b7944a1 100644 --- a/hudson-core/src/main/java/hudson/model/Job.java +++ b/hudson-core/src/main/java/hudson/model/Job.java @@ -85,7 +85,7 @@ import net.sf.json.JSONException; import net.sf.json.JSONObject; import org.eclipse.hudson.api.model.IJob; -import org.eclipse.hudson.api.model.IProperty; +import org.eclipse.hudson.api.model.IProjectProperty; import org.jvnet.localizer.Localizable; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; @@ -131,7 +131,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R private transient volatile boolean holdOffBuildUntilSave; private volatile LogRotator logRotator; - private ConcurrentMap<String, IProperty> jobProperties = new ConcurrentHashMap<String, IProperty>(); + private ConcurrentMap<String, IProjectProperty> jobProperties = new ConcurrentHashMap<String, IProjectProperty>(); /** * Not all plugins are good at calculating their health report quickly. @@ -211,7 +211,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R * @param key key. * @param property property instance. */ - protected void putJobProperty(String key, IProperty property) { + protected void putJobProperty(String key, IProjectProperty property) { jobProperties.put(key, property); } @@ -219,20 +219,20 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R * Returns job property by specified key. * * @param key key. - * @return {@link IProperty} instance or null. + * @return {@link org.eclipse.hudson.api.model.IProjectProperty} instance or null. */ - public IProperty getProperty(String key){ + public IProjectProperty getProperty(String key){ return getProperty(key, null); } /** * {@inheritDoc} */ - public IProperty getProperty(String key, Class clazz) { - IProperty t = jobProperties.get(key); + public IProjectProperty getProperty(String key, Class clazz) { + IProjectProperty t = jobProperties.get(key); if (null == t && null != clazz) { try { - t = (IProperty) clazz.newInstance(); + t = (IProjectProperty) clazz.newInstance(); t.setJob(this); t.setKey(key); putJobProperty(key, t); @@ -245,12 +245,12 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R return t; } - public StringProperty getStringProperty(String key) { - return (StringProperty) getProperty(key, StringProperty.class); + public StringProjectProperty getStringProperty(String key) { + return (StringProjectProperty) getProperty(key, StringProjectProperty.class); } - public BooleanProperty getBooleanProperty(String key){ - return (BooleanProperty) getProperty(key, BooleanProperty.class); + public BooleanProjectProperty getBooleanProperty(String key){ + return (BooleanProjectProperty) getProperty(key, BooleanProjectProperty.class); } @Override @@ -308,9 +308,9 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R } if (null == jobProperties) { - jobProperties = new ConcurrentHashMap<String, IProperty>(); + jobProperties = new ConcurrentHashMap<String, IProjectProperty>(); } - for (IProperty property : jobProperties.values()) { + for (IProjectProperty property : jobProperties.values()) { property.setJob(this); } } diff --git a/hudson-core/src/main/java/hudson/model/StringProperty.java b/hudson-core/src/main/java/hudson/model/StringProjectProperty.java index ef86fe2..9e9d8dc 100644 --- a/hudson-core/src/main/java/hudson/model/StringProperty.java +++ b/hudson-core/src/main/java/hudson/model/StringProjectProperty.java @@ -17,7 +17,7 @@ package hudson.model; import org.apache.commons.lang3.StringUtils; -public class StringProperty extends BaseProperty<String> { +public class StringProjectProperty extends BaseProjectProperty<String> { @Override protected String prepareValue(String candidateValue) { diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java index c582dd3..11be85d 100644 --- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java +++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IJob.java @@ -47,9 +47,9 @@ public interface IJob<T extends IJob> { * * @param key key. * @param clazz IProperty subclass. - * @return {@link IProperty} instance or null. + * @return {@link IProjectProperty} instance or null. */ - IProperty getProperty(String key, Class<? extends IProperty> clazz); + IProjectProperty getProperty(String key, Class<? extends IProjectProperty> clazz); /** * Checks whether current job is inherited from other project. diff --git a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProperty.java b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java index 72a524d..bac6097 100644 --- a/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProperty.java +++ b/hudson-core/src/main/java/org/eclipse/hudson/api/model/IProjectProperty.java @@ -24,7 +24,7 @@ import java.io.Serializable; * * @author Nikita Levyankov */ -public interface IProperty<T> extends Serializable { +public interface IProjectProperty<T> extends Serializable { /** * Sets key for given property. |

