maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r749482 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/execution/ maven-embedder/src/main/java/org/apache/maven/embedder/
Date Tue, 03 Mar 2009 00:00:40 GMT
Author: bentmann
Date: Tue Mar  3 00:00:40 2009
New Revision: 749482

URL: http://svn.apache.org/viewvc?rev=749482&view=rev
Log:
o Added generics

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=749482&r1=749481&r2=749482&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Tue Mar  3 00:00:40 2009
@@ -55,7 +55,7 @@
 
     private List profiles;
 
-    private List pluginGroups = new ArrayList();
+    private List<String> pluginGroups = new ArrayList<String>();
 
     private boolean usePluginUpdateOverride;
 
@@ -77,7 +77,7 @@
 
     private File basedir;
 
-    private List goals;
+    private List<String> goals;
 
     private boolean useReactor = false;
 
@@ -95,11 +95,11 @@
 
     private boolean showErrors = false;
 
-    private List eventMonitors;
+    private List<EventMonitor> eventMonitors;
 
-    private List activeProfiles;
+    private List<String> activeProfiles;
 
-    private List inactiveProfiles;
+    private List<String> inactiveProfiles;
 
     private TransferListener transferListener;
 
@@ -181,7 +181,7 @@
         return localRepositoryPath;
     }
 
-    public List getGoals()
+    public List<String> getGoals()
     {
         return goals;
     }
@@ -222,7 +222,7 @@
         return interactiveMode;
     }
 
-    public List getEventMonitors()
+    public List<EventMonitor> getEventMonitors()
     {
         return eventMonitors;
     }
@@ -232,17 +232,17 @@
         this.basedir = basedir;
     }
 
-    public void setEventMonitors( List eventMonitors )
+    public void setEventMonitors( List<EventMonitor> eventMonitors )
     {
         this.eventMonitors = eventMonitors;
     }
 
-    public void setActiveProfiles( List activeProfiles )
+    public void setActiveProfiles( List<String> activeProfiles )
     {
         this.activeProfiles = activeProfiles;
     }
 
-    public void setInactiveProfiles( List inactiveProfiles )
+    public void setInactiveProfiles( List<String> inactiveProfiles )
     {
         this.inactiveProfiles = inactiveProfiles;
     }
@@ -257,20 +257,20 @@
         this.projectBuildingConfiguration = projectBuildingConfiguration;
     }
 
-    public List getActiveProfiles()
+    public List<String> getActiveProfiles()
     {
         if ( activeProfiles == null )
         {
-            activeProfiles = new ArrayList();
+            activeProfiles = new ArrayList<String>();
         }
         return activeProfiles;
     }
 
-    public List getInactiveProfiles()
+    public List<String> getInactiveProfiles()
     {
         if ( inactiveProfiles == null )
         {
-            inactiveProfiles = new ArrayList();
+            inactiveProfiles = new ArrayList<String>();
         }
         return inactiveProfiles;
     }
@@ -335,7 +335,7 @@
         return this;
     }
 
-    public MavenExecutionRequest setGoals( List goals )
+    public MavenExecutionRequest setGoals( List<String> goals )
     {
         this.goals = goals;
 
@@ -417,14 +417,14 @@
         return this;
     }
 
-    public MavenExecutionRequest addActiveProfiles( List profiles )
+    public MavenExecutionRequest addActiveProfiles( List<String> profiles )
     {
         getActiveProfiles().addAll( profiles );
 
         return this;
     }
 
-    public MavenExecutionRequest addInactiveProfiles( List profiles )
+    public MavenExecutionRequest addInactiveProfiles( List<String> profiles )
     {
         getInactiveProfiles().addAll( profiles );
 
@@ -435,7 +435,7 @@
     {
         if ( eventMonitors == null )
         {
-            eventMonitors = new ArrayList();
+            eventMonitors = new ArrayList<EventMonitor>();
         }
 
         eventMonitors.add( monitor );
@@ -574,12 +574,12 @@
         return this;
     }
 
-    public List getPluginGroups()
+    public List<String> getPluginGroups()
     {
         return pluginGroups;
     }
 
-    public MavenExecutionRequest setPluginGroups( List pluginGroups )
+    public MavenExecutionRequest setPluginGroups( List<String> pluginGroups )
     {
         this.pluginGroups = pluginGroups;
 

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=749482&r1=749481&r2=749482&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Tue Mar  3 00:00:40 2009
@@ -89,8 +89,8 @@
     Date getStartTime();
 
     // Goals
-    MavenExecutionRequest setGoals( List goals );
-    List getGoals();
+    MavenExecutionRequest setGoals( List<String> goals );
+    List<String> getGoals();
 
     // Properties
     MavenExecutionRequest setProperties( Properties properties );
@@ -113,7 +113,7 @@
 
     // Event monitors
     MavenExecutionRequest addEventMonitor( EventMonitor monitor );
-    List getEventMonitors();
+    List<EventMonitor> getEventMonitors();
 
     // Pom
     MavenExecutionRequest setPomFile( String pomFilename );
@@ -165,12 +165,12 @@
     List getProfiles();
     MavenExecutionRequest setProfiles( List profiles );
     MavenExecutionRequest addActiveProfile( String profile );
-    MavenExecutionRequest addActiveProfiles( List profiles );
-    List getActiveProfiles();
+    MavenExecutionRequest addActiveProfiles( List<String> profiles );
+    List<String> getActiveProfiles();
     //MAPI: do we really need to do this? deactivate active profile? seems confusing.
     MavenExecutionRequest addInactiveProfile( String profile );
-    MavenExecutionRequest addInactiveProfiles( List profiles );
-    List getInactiveProfiles();
+    MavenExecutionRequest addInactiveProfiles( List<String> profiles );
+    List<String> getInactiveProfiles();
 
     // Proxies
     List getProxies();
@@ -185,8 +185,8 @@
     MavenExecutionRequest setMirrors( List mirrors );
 
     // Plugin groups
-    List getPluginGroups();
-    MavenExecutionRequest setPluginGroups( List pluginGroups );
+    List<String> getPluginGroups();
+    MavenExecutionRequest setPluginGroups( List<String> pluginGroups );
 
     boolean isUsePluginUpdateOverride();
     MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
@@ -211,7 +211,7 @@
     MavenExecutionRequest setGlobalSettingsFile( File globalSettingsFile );
 
     MavenExecutionRequest addRemoteRepository( ArtifactRepository repository );
-    List getRemoteRepositories();
+    List<ArtifactRepository> getRemoteRepositories();
 
     MavenExecutionRequest setRealmManager( MavenRealmManager realmManager );
     MavenRealmManager getRealmManager();

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java?rev=749482&r1=749481&r2=749482&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
Tue Mar  3 00:00:40 2009
@@ -95,10 +95,10 @@
     Configuration addInactiveProfile( String profile );
 
     /** Add a list of String instances with names of profiles to activate. */
-    Configuration addActiveProfiles( List profiles );
+    Configuration addActiveProfiles( List<String> profiles );
 
     /** Add a list of String instances with names of profiles to inactivate. */
-    Configuration addInactiveProfiles( List profiles );
+    Configuration addInactiveProfiles( List<String> profiles );
 
     /** Set a customizer callback implemetation that will be given a chance to modify the
plexus container on startup. */
     Configuration setConfigurationCustomizer( ContainerCustomizer customizer );
@@ -106,9 +106,9 @@
     /** set the system properties to be used during the lifecycle of the embedder. Excluding
the time when executing the project, then the properties from MavenExecutionRequestare used.
*/
     Configuration setSystemProperties( Properties properties );
 
-    List getActiveProfiles();
+    List<String> getActiveProfiles();
 
-    List getInactiveProfiles();
+    List<String> getInactiveProfiles();
 
     // ----------------------------------------------------------------------------
     // Container Customizer
@@ -128,7 +128,7 @@
 
     void addExtension( URL url );
 
-    List getExtensions();
+    List<URL> getExtensions();
 
     Configuration setRealmManager( MavenRealmManager realmManager );
 
@@ -148,7 +148,7 @@
 
     Configuration addEventMonitor( EventMonitor eventMonitor );
 
-    Configuration setEventMonitors( List eventMonitors );
+    Configuration setEventMonitors( List<EventMonitor> eventMonitors );
 
-    List getEventMonitors();
+    List<EventMonitor> getEventMonitors();
 }

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java?rev=749482&r1=749481&r2=749482&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
Tue Mar  3 00:00:40 2009
@@ -38,9 +38,9 @@
 public class DefaultConfiguration
     implements Configuration
 {
-    private List inactives;
+    private List<String> inactives;
 
-    private List actives;
+    private List<String> actives;
 
     private File userSettings;
 
@@ -50,8 +50,7 @@
 
     private Properties systemProperties;
 
-    /** List&lt;URL&gt;. */
-    private List extensions = new ArrayList();
+    private List<URL> extensions = new ArrayList<URL>();
 
     private MavenEmbedderLogger logger;
 
@@ -65,8 +64,7 @@
 
     private CoreErrorReporter errorReporter;
 
-    /** List&lt;EventMonitor&gt;. */
-    private List eventMonitors;
+    private List<EventMonitor> eventMonitors;
 
     /** Creates a new instance of DefaultConfiguration */
     public DefaultConfiguration()
@@ -87,34 +85,34 @@
         return this;
     }
 
-    public Configuration addActiveProfiles( List profiles )
+    public Configuration addActiveProfiles( List<String> profiles )
     {
         getActiveProfiles().addAll( profiles );
 
         return this;
     }
 
-    public Configuration addInactiveProfiles( List profiles )
+    public Configuration addInactiveProfiles( List<String> profiles )
     {
         getInactiveProfiles().addAll( profiles );
 
         return this;
     }
 
-    public List getActiveProfiles()
+    public List<String> getActiveProfiles()
     {
         if ( actives == null )
         {
-            actives = new ArrayList();
+            actives = new ArrayList<String>();
         }
         return actives;
     }
 
-    public List getInactiveProfiles()
+    public List<String> getInactiveProfiles()
     {
         if ( inactives == null )
         {
-            inactives = new ArrayList();
+            inactives = new ArrayList<String>();
         }
         return inactives;
     }
@@ -168,7 +166,7 @@
         extensions.add( url );
     }
 
-    public List getExtensions()
+    public List<URL> getExtensions()
     {
         return extensions;
     }
@@ -255,7 +253,7 @@
     {
         if ( eventMonitors == null )
         {
-            eventMonitors = new ArrayList();
+            eventMonitors = new ArrayList<EventMonitor>();
         }
 
         eventMonitors.add( eventMonitor );
@@ -263,12 +261,12 @@
         return this;
     }
 
-    public List getEventMonitors()
+    public List<EventMonitor> getEventMonitors()
     {
         return eventMonitors;
     }
 
-    public Configuration setEventMonitors( List eventMonitors )
+    public Configuration setEventMonitors( List<EventMonitor> eventMonitors )
     {
         this.eventMonitors = eventMonitors;
         return this;



Mime
View raw message