continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ri...@apache.org
Subject svn commit: r498032 - in /maven/continuum/branches/id-refactor/continuum-core/src: main/java/org/apache/maven/continuum/core/action/ test/java/org/apache/maven/continuum/buildcontroller/
Date Sat, 20 Jan 2007 01:06:20 GMT
Author: rinku
Date: Fri Jan 19 17:06:19 2007
New Revision: 498032

URL: http://svn.apache.org/viewvc?view=rev&rev=498032
Log:
o  more fixes for int Ids.

Modified:
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
    maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
Fri Jan 19 17:06:19 2007
@@ -89,9 +89,9 @@
     //
     // ----------------------------------------------------------------------
 
-    public static int getProjectId( Map context )
+    public static long getProjectId( Map context )
     {
-        return getInteger( context, KEY_PROJECT_ID );
+        return getLong( context, KEY_PROJECT_ID );
     }
 
     public static Project getProject( Map context )
@@ -99,14 +99,14 @@
         return (Project) getObject( context, KEY_PROJECT );
     }
 
-    public static int getProjectGroupId( Map context )
+    public static long getProjectGroupId( Map context )
     {
-        return getInteger( context, KEY_PROJECT_GROUP_ID );
+        return getLong( context, KEY_PROJECT_GROUP_ID );
     }
 
-    public static int getBuildDefinitionId( Map context )
+    public static long getBuildDefinitionId( Map context )
     {
-        return getInteger( context, KEY_BUILD_DEFINITION_ID );
+        return getLong( context, KEY_BUILD_DEFINITION_ID );
     }
 
     public static BuildDefinition getBuildDefinition( Map context )
@@ -183,6 +183,17 @@
         return ( (Boolean) getObject( context, key ) ).booleanValue();
     }
 
+    protected static long getLong( Map context, String key )
+    {
+        return ( (Long) getObject( context, key, null ) ).longValue();
+    }
+
+    /**
+     * Being used selectively now.
+     * @param context
+     * @param key
+     * @return
+     */
     protected static int getInteger( Map context, String key )
     {
         return ( (Integer) getObject( context, key, null ) ).intValue();

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
Fri Jan 19 17:06:19 2007
@@ -55,7 +55,7 @@
     public void execute( Map context )
         throws ContinuumException, ContinuumStoreException
     {
-        int projectGroupId =  getProjectGroupId( context );
+        long projectGroupId =  getProjectGroupId( context );
 
         ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId
);
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
Fri Jan 19 17:06:19 2007
@@ -43,7 +43,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectId = getProjectId( map );
+        long projectId = getProjectId( map );
 
         Project project = store.getProjectWithAllDetails( projectId );
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
Fri Jan 19 17:06:19 2007
@@ -42,7 +42,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectGroupId =  getProjectGroupId( map );
+        long projectGroupId =  getProjectGroupId( map );
 
         ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId
);
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
Fri Jan 19 17:06:19 2007
@@ -42,7 +42,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectId =  getProjectId( map );
+        long projectId =  getProjectId( map );
 
         Project project = store.getProjectWithAllDetails( projectId );
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
Fri Jan 19 17:06:19 2007
@@ -43,7 +43,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectGroupId =  getProjectGroupId( map );
+        long projectGroupId =  getProjectGroupId( map );
 
         ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId
);
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
Fri Jan 19 17:06:19 2007
@@ -42,7 +42,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectId = getProjectId( map );
+        long projectId = getProjectId( map );
 
         Project project = store.getProjectWithAllDetails( projectId );
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
Fri Jan 19 17:06:19 2007
@@ -42,7 +42,7 @@
         throws Exception
     {
         BuildDefinition buildDefinition = getBuildDefinition( map );
-        int projectGroupId = getProjectGroupId( map );
+        long projectGroupId = getProjectGroupId( map );
 
         ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId
);
 

Modified: maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java?view=diff&rev=498032&r1=498031&r2=498032
==============================================================================
--- maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
(original)
+++ maven/continuum/branches/id-refactor/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
Fri Jan 19 17:06:19 2007
@@ -235,7 +235,7 @@
 
         actionManager.lookup( "store-project-group" ).execute( pgContext );
 
-        int projectGroupId = AbstractContinuumAction.getProjectGroupId( pgContext );
+        long projectGroupId = AbstractContinuumAction.getProjectGroupId( pgContext );
 
         projectGroup = continuumStore.getProjectGroupWithBuildDetails( projectGroupId );
 



Mime
View raw message