Merge pull request #1 from jglick/JENKINS-23159-default

[JENKINS-23159] Do not show column by default
jenkinsci · Jun 12, 2014 · 51fb9a2 · 51fb9a2
2 parents b31d6ae + 2b11c94
commit 51fb9a2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/work/
diff --git a/pom.xml b/pom.xml
@@ -1,17 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.jvnet.hudson.plugins</groupId>
+		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>1.350</version> <!-- which version of Hudson is this plugin built against? -->
-		<relativePath>../pom.xml</relativePath>
+		<version>1.424</version>
 	</parent>
 
 	<artifactId>cron_column</artifactId>
-	<version>1.004-SNAPSHOT</version>
-	<url>http://wiki.hudson-ci.org/display/HUDSON/Cron+Column+Plugin</url>
+	<version>1.1-SNAPSHOT</version>
+	<url>http://wiki.jenkins-ci.org/display/JENKINS/Cron+Column+Plugin</url>
 	<packaging>hpi</packaging>
-	<name>Hudson Cron Column Plugin</name>
+	<name>Cron Column Plugin</name>
 
 	<developers>
 		<developer>
@@ -21,6 +20,11 @@
 		</developer>
 	</developers>
 
+    <scm>
+        <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
+        <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
+        <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+    </scm>
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>

diff --git a/src/main/java/hudson/plugins/CronViewColumn.java b/src/main/java/hudson/plugins/CronViewColumn.java
@@ -8,7 +8,6 @@
 
 import hudson.Extension;
 import hudson.model.AbstractProject;
-import hudson.model.Descriptor;
 import hudson.model.Job;
 import hudson.scm.NullSCM;
 import hudson.scm.SCM;
@@ -17,6 +16,7 @@
 import hudson.triggers.Trigger;
 import hudson.triggers.TriggerDescriptor;
 import hudson.views.ListViewColumn;
+import hudson.views.ListViewColumnDescriptor;
 
 
 /**
@@ -124,7 +124,7 @@ else if(trigger instanceof TimerTrigger)
 
 
     @Extension
-    public static final Descriptor<ListViewColumn> DESCRIPTOR = new Descriptor<ListViewColumn>(){
+    public static final class DescriptorImpl extends ListViewColumnDescriptor {
         @Override
         public ListViewColumn newInstance(StaplerRequest req, JSONObject formData){
         	return new CronViewColumn();
@@ -134,9 +134,11 @@ public ListViewColumn newInstance(StaplerRequest req, JSONObject formData){
 		public String getDisplayName(){
 			return "CronTrigger";
 		}
-    };
-
-    public Descriptor<ListViewColumn> getDescriptor(){
-        return DESCRIPTOR;
+
+        @Override
+        public boolean shownByDefault() {
+            return false;
+        }
     }
+
 }