svn commit: r386655 - in /maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum: core/action/CreateProjectsFromMetadata.java initialization/DefaultContinuumInitializer.java

[ev...@apache.org]

Author: evenisse
Date: Fri Mar 17 07:25:10 2006
New Revision: 386655

URL: http://svn.apache.org/viewcvs?rev=386655&view=rev
Log:
clean code

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java?rev=386655&r1=386654&r2=386655&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java Fri Mar 17 07:25:10 2006
@@ -9,13 +9,12 @@
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager;
 import org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManagerException;
+import org.codehaus.plexus.formica.util.MungedHttpsURL;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
 
-import org.codehaus.plexus.formica.util.MungedHttpsURL;
-
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -42,7 +41,7 @@
 
         ContinuumProjectBuilder projectBuilder = projectBuilderManager.getProjectBuilder( projectBuilderId );
 
-        ContinuumProjectBuildingResult result = null;
+        ContinuumProjectBuildingResult result;
 
         try
         {

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=386655&r1=386654&r2=386655&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Fri Mar 17 07:25:10 2006
@@ -19,8 +19,8 @@
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.model.system.ContinuumUser;
 import org.apache.maven.continuum.model.system.Permission;
-import org.apache.maven.continuum.model.system.UserGroup;
 import org.apache.maven.continuum.model.system.SystemConfiguration;
+import org.apache.maven.continuum.model.system.UserGroup;
 import org.apache.maven.continuum.security.ContinuumSecurity;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
@@ -55,8 +55,6 @@
     //TODO: move this to an other place
     public static final String DEFAULT_SCHEDULE_NAME = "DEFAULT_SCHEDULE";
 
-    private Schedule defaultSchedule;
-
     private SystemConfiguration systemConf;
 
     // ----------------------------------------------------------------------
@@ -94,9 +92,9 @@
 
             if ( s == null )
             {
-                defaultSchedule = createDefaultSchedule();
+                Schedule defaultSchedule = createDefaultSchedule();
 
-                defaultSchedule = store.addSchedule( defaultSchedule );
+                store.addSchedule( defaultSchedule );
             }
 
             // Permission
@@ -164,7 +162,7 @@
         createPermission( "manageUsers", "Manage Users/Groups" );
     }
 
-    private Permission createPermission( String name, String description)
+    private Permission createPermission( String name, String description )
         throws ContinuumStoreException
     {
         Permission perm = store.getPermission( name );
@@ -199,7 +197,7 @@
 
             adminGroup.setPermissions( adminPermissions );
 
-            adminGroup = store.addUserGroup( adminGroup );
+            store.addUserGroup( adminGroup );
         }
 
         // Continuum Guest
@@ -219,7 +217,7 @@
 
             guestGroup.setPermissions( guestPermissions );
 
-            guestGroup = store.addUserGroup( guestGroup );
+            store.addUserGroup( guestGroup );
         }
     }
 
@@ -238,7 +236,7 @@
 
             guest.setGuest( true );
 
-            guest = store.addUser( guest );
+            store.addUser( guest );
         }
     }
 }