minor compiler warning, codestyle fixes

 - removed redundant import statements
 - added servial version ids to serializable classes

src/main/java/hudson/plugins/git/Branch.java

@@ -5,6 +5,7 @@
 
 public class Branch extends GitObject
 {
+	private static final long serialVersionUID = 1L;
 
 	public Branch(String name, ObjectId sha1) {
 		super(name, sha1);

src/main/java/hudson/plugins/git/GitAPI.java

@@ -17,13 +17,10 @@
 import java.io.PrintStream;
 import java.io.StringReader;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.spearce.jgit.lib.AnyObjectId;
 import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.ObjectId;
 import org.spearce.jgit.lib.Ref;
@@ -37,12 +34,12 @@ public class GitAPI implements IGitAPI {
 	TaskListener listener;
 	String gitExe;
 	EnvVars environment;
-	
+
 	public GitAPI(String gitExe, FilePath workspace,
 			TaskListener listener, EnvVars environment) {
-		
+
 	    //listener.getLogger().println("Git API @ " + workspace.getName() + " / " + workspace.getRemote() + " - " + workspace.getChannel());
-	    
+
 		this.workspace = workspace;
 		this.listener = listener;
 		this.gitExe = gitExe;
@@ -52,19 +49,19 @@ public GitAPI(String gitExe, FilePath workspace,
 		for(Map.Entry<String,String> ent : environment.entrySet()) {
 		    log.println("Env: " + ent.getKey() + "=" + ent.getValue());
 		}
-		
+
 		launcher = new LocalLauncher(listener);
-		
+
 	}
-	
+
 	public String getGitExe() {
 		return gitExe;
 	}
 
 	public EnvVars getEnvironment() {
 	    return environment;
 	}
-	
+
 	public boolean hasGitRepo() throws GitException {
 		try {
 
@@ -146,9 +143,11 @@ public void clone(final RemoteConfig remoteConfig) throws GitException {
 
 		// Assume only 1 URL for this repository
 		final String source = remoteConfig.getURIs().get(0).toString();
-		
+
 		try {
 			workspace.act(new FileCallable<String>() {
+				private static final long serialVersionUID = 1L;
+
 				public String invoke(File workspace,
 						VirtualChannel channel) throws IOException {
 					final ArgumentListBuilder args = new ArgumentListBuilder();
@@ -163,7 +162,7 @@ public String invoke(File workspace,
 			throw new GitException("Could not clone " + source, e);
 		}
 	}
-	
+
 	public void clean() throws GitException {
 		ArgumentListBuilder args = new ArgumentListBuilder();
 		args.add(getGitExe(), "clean", "-fdx");
@@ -176,14 +175,14 @@ public ObjectId revParse(String revName) throws GitException {
 		String result = launchCommand(args.toCommandArray());
 		return ObjectId.fromString(firstLine(result).trim());
 	}
-	
+
 	public String describe(String commitIsh) throws GitException {
         ArgumentListBuilder args = new ArgumentListBuilder();
         args.add(getGitExe(), "describe", "--tags", commitIsh);
         String result = launchCommand(args.toCommandArray());
         return firstLine(result).trim();
     }
-	
+
 	private String firstLine(String result) {
 		BufferedReader reader = new BufferedReader(new StringReader(result));
 		String line;
@@ -196,7 +195,7 @@ private String firstLine(String result) {
 		} catch (IOException e) {
 			throw new GitException("Error parsing result");
 		}
-		
+
 		return line;
 	}
 
@@ -301,11 +300,11 @@ private String launchCommandIn(String[] args, FilePath workDir) throws GitExcept
 		try {
 			int status = launcher.launch(args,
 					environment, fos, workDir).join();
-	
+
 			String result = fos.toString();
-			
+
 			System.out.println(result);
-			
+
 			if (status != 0) {
 				throw new GitException("Command returned status code " + status + ": " + result);
 			}
@@ -328,10 +327,10 @@ public void push(RemoteConfig repository, String refspec) throws GitException {
 		// That are possible.
 	}
 
-	private List<Branch> parseBranches(String fos) throws GitException 
+	private List<Branch> parseBranches(String fos) throws GitException
 	{
 	    // TODO: git branch -a -v --abbrev=0 would do this in one shot..
-	    
+
 	    List<Branch> tags = new ArrayList<Branch>();
 
 		BufferedReader rdr = new BufferedReader(new StringReader(fos));
@@ -357,14 +356,14 @@ public List<Branch> getBranches() throws GitException {
 		args.add(getGitExe(), "branch", "-a");
 		return parseBranches(launchCommand(args.toCommandArray()));
 	}
-	
+
 	public List<Branch> getRemoteBranches() throws GitException, IOException {
-		
-		
+
+
 		Repository db = getRepository();
 		Map<String, Ref> refs = db.getAllRefs();
 		List<Branch> branches = new ArrayList<Branch>();
-		
+
 		for(Ref candidate : refs.values())
 		{
 			if( candidate.getName().startsWith(Constants.R_REMOTES) )
@@ -374,7 +373,7 @@ public List<Branch> getRemoteBranches() throws GitException, IOException {
 				branches.add( buildBranch );
 			}
 		}
-		
+
 		return branches;
 	}
 
@@ -407,8 +406,8 @@ public void deleteTag(String tagName) throws GitException {
 			throw new GitException("Could not delete tag " + tagName, e);
 		}
 	}
-	
-	
+
+
 
 	public List<IndexEntry> lsTree(String treeIsh) throws GitException {
 		List<IndexEntry> entries = new ArrayList<IndexEntry>();
@@ -497,15 +496,15 @@ public void fetch(RemoteConfig remoteRepository) throws GitException
     {
         // Assume there is only 1 URL / refspec for simplicity
     	fetch(remoteRepository.getURIs().get(0).toString(), remoteRepository.getFetchRefSpecs().get(0).toString());
-        
+
     }
 
     public ObjectId mergeBase(ObjectId id1, ObjectId id2)
     {
         try {
         	 ArgumentListBuilder args = new ArgumentListBuilder();
              args.add(getGitExe(), "merge-base", id1.name(), id2.name());
-             
+
              ByteArrayOutputStream fos = new ByteArrayOutputStream();
              int status = launcher.launch(args.toCommandArray(),
                      environment, fos, workspace).join();
@@ -516,10 +515,10 @@ public ObjectId mergeBase(ObjectId id1, ObjectId id2)
                  return null;
              }
 
-           
+
              BufferedReader rdr = new BufferedReader(new StringReader(result));
              String line;
-             
+
             while ((line = rdr.readLine()) != null) {
                 // Add the SHA1
                 return ObjectId.fromString(line);
@@ -535,22 +534,22 @@ private Repository getRepository() throws IOException
     {
     	return new Repository(new File(workspace.getRemote(), ".git"));
     }
-    
+
     public List<Tag> getTagsOnCommit(String revName) throws GitException, IOException
     {
         Repository db = getRepository();
         ObjectId commit = db.resolve(revName);
         List<Tag> ret = new ArrayList<Tag>();
-        
+
         for (final Map.Entry<String, Ref> tag : db.getTags().entrySet()) {
-            
+
             Tag ttag = db.mapTag(tag.getKey());
             if( ttag.getObjId().equals(commit) )
             {
                 ret.add(ttag);
             }
         }
         return ret;
-        
+
     }
 }

src/main/java/hudson/plugins/git/GitChangeSet.java

@@ -30,7 +30,7 @@ public GitChangeSet(List<String> lines) {
 	}
 
 	private void parseCommit(List<String> lines) {
-		
+
 		String comment = "";
 
 		for (String line : lines) {

src/main/java/hudson/plugins/git/GitException.java

@@ -1,6 +1,8 @@
 package hudson.plugins.git;
 
 public class GitException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+
 	public GitException() {
 		super();
 	}

src/main/java/hudson/plugins/git/GitPublisher.java

@@ -8,7 +8,6 @@
 import hudson.model.BuildListener;
 import hudson.model.Descriptor;
 import hudson.model.Result;
-import hudson.plugins.git.util.BuildData;
 import hudson.remoting.VirtualChannel;
 import hudson.scm.SCM;
 import hudson.tasks.BuildStepDescriptor;
@@ -28,6 +27,7 @@
 import org.spearce.jgit.transport.RemoteConfig;
 
 public class GitPublisher extends Publisher implements Serializable {
+	private static final long serialVersionUID = 1L;
 
 	public Descriptor<Publisher> getDescriptor() {
 		return DESCRIPTOR;
@@ -50,7 +50,7 @@ public boolean perform(final AbstractBuild<?, ?> build,
 		final String projectName = build.getProject().getName();
 		final int buildNumber = build.getNumber();
 		final Result buildResult = build.getResult();
-		
+
 		boolean canPerform;
 		try {
 			canPerform = build.getProject().getWorkspace().act(
@@ -91,9 +91,9 @@ public Boolean invoke(File workspace,
 									&& buildResult.isBetterOrEqualTo(
 											Result.SUCCESS)) {
 								listener.getLogger().println("Pushing result " + buildnumber + " to " + gitSCM.getMergeOptions().getMergeTarget() + " branch of origin repository");
-								
+
 								RemoteConfig remote = gitSCM.getRepositories().get(0);
-								
+
 								git.push(remote, "HEAD:" + gitSCM.getMergeOptions().getMergeTarget());
 							} else {
 								//listener.getLogger().println("Pushing result " + buildnumber + " to origin repository");
@@ -107,7 +107,7 @@ public Boolean invoke(File workspace,
 			listener.error("Failed to push tags to origin repository: " + e.getMessage());
 			build.setResult(Result.FAILURE);
 			return false;
-			
+
 		}
 		return canPerform;
 	}

src/main/java/hudson/plugins/git/GitSCM.java

@@ -241,6 +241,8 @@ public boolean pollChanges(final AbstractProject project, Launcher launcher,
         final String singleBranch = getSingleBranch(lastBuild);
 
 		boolean pollChangesResult = workspace.act(new FileCallable<Boolean>() {
+			private static final long serialVersionUID = 1L;
+
 			public Boolean invoke(File localWorkspace, VirtualChannel channel)
 					throws IOException {
 
@@ -427,6 +429,7 @@ public boolean checkout(final AbstractBuild build, Launcher launcher,
         final String singleBranch = getSingleBranch(build);
 
 		final Revision revToBuild = workspace.act(new FileCallable<Revision>() {
+			private static final long serialVersionUID = 1L;
 			public Revision invoke(File localWorkspace, VirtualChannel channel)
 					throws IOException {
 			    FilePath ws = new FilePath(localWorkspace);
@@ -506,6 +509,7 @@ public Revision invoke(File localWorkspace, VirtualChannel channel)
 		if (mergeOptions.doMerge()) {
 			if (!revToBuild.containsBranchName(mergeOptions.getMergeTarget())) {
 				returnData = workspace.act(new FileCallable<Object[]>() {
+					private static final long serialVersionUID = 1L;
 					public Object[] invoke(File localWorkspace, VirtualChannel channel)
 							throws IOException {
 						EnvVars environment;
@@ -597,6 +601,7 @@ public Object[] invoke(File localWorkspace, VirtualChannel channel)
 		// No merge
 
 		returnData = workspace.act(new FileCallable<Object[]>() {
+			private static final long serialVersionUID = 1L;
 			public Object[] invoke(File localWorkspace, VirtualChannel channel)
 					throws IOException {
                 IGitAPI git = new GitAPI(gitExe, new FilePath(localWorkspace), listener, environment);

src/main/java/hudson/plugins/git/SubmoduleConfig.java

@@ -4,9 +4,10 @@
 
 public class SubmoduleConfig implements java.io.Serializable
 {
+  private static final long serialVersionUID = 1L;
   String   submoduleName;
   String[] branches;
-  
+
   public String getSubmoduleName()
   {
     return submoduleName;
@@ -35,7 +36,7 @@ public boolean revisionMatchesInterest(Revision r)
     }
     return false;
   }
-  
+
   public boolean branchMatchesInterest(Branch br)
   {
     for (String regex : branches)

src/main/java/hudson/plugins/git/Tag.java

@@ -4,9 +4,10 @@
 
 public class Tag extends GitObject
 {
+	private static final long serialVersionUID = 1L;
 	public String commitSHA1;
 	public String commitMessage;
-	
+
 	public String getCommitMessage()
     {
         return commitMessage;

src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java

@@ -4,8 +4,9 @@
 
 public class PreBuildMergeOptions implements Serializable
 {
-    public String mergeTarget = null;
-
+	private static final long serialVersionUID = 1L;
+	public String mergeTarget = null;
+
     public String getMergeTarget()
     {
         return mergeTarget;

src/main/java/hudson/plugins/git/util/BuildChooser.java

@@ -1,8 +1,6 @@
 package hudson.plugins.git.util;
 
-import hudson.model.AbstractBuild;
 import hudson.model.Action;
-import hudson.model.ParametersAction;
 import hudson.model.Result;
 import hudson.plugins.git.Branch;
 import hudson.plugins.git.BranchSpec;