jvanzyl 2003/12/07 07:03:18
Modified: maven-model maven-model.iws
maven-model/src/java/org/apache/maven/model Model.java
maven-model/src/test/org/apache/maven/model ModelTest.java
Log:
o for the model lists we'll create them lazily to save resources.
Revision Changes Path
1.5 +14 -14 maven-components/maven-model/maven-model.iws
Index: maven-model.iws
===================================================================
RCS file: /home/cvs/maven-components/maven-model/maven-model.iws,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-model.iws 4 Dec 2003 08:07:27 -0000 1.4
+++ maven-model.iws 7 Dec 2003 15:03:18 -0000 1.5
@@ -22,17 +22,17 @@
</folding>
</source-position-entry>
<source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java"
line="41" column="57" vertical-scroll-proportion="0.63908875"
horizontal-scroll-proportion="0.40617576" />
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java"
line="32" column="38" vertical-scroll-proportion="0.25179857"
horizontal-scroll-proportion="0.27078384">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java"
line="32" column="38" vertical-scroll-proportion="0.2589928"
horizontal-scroll-proportion="0.27078384">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="715"
column="0" vertical-scroll-proportion="0.23980816" horizontal-scroll-proportion="0.0">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="182"
column="0" vertical-scroll-proportion="0.8417266" horizontal-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="118"
column="34" vertical-scroll-proportion="0.4268585"
horizontal-scroll-proportion="0.24401914">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="44"
column="0" vertical-scroll-proportion="0.68585134" horizontal-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -47,17 +47,17 @@
</source-position-entry>
<source-position-entry url="file://$PROJECT_DIR$/project.xml" line="35"
column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
<source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/SourceModificationTest.java"
line="28" column="0" vertical-scroll-proportion="0.43645084"
horizontal-scroll-proportion="0.0" />
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java"
line="32" column="38" vertical-scroll-proportion="0.25179857"
horizontal-scroll-proportion="0.27078384">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java"
line="32" column="38" vertical-scroll-proportion="0.2589928"
horizontal-scroll-proportion="0.27078384">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="118"
column="34" vertical-scroll-proportion="0.4268585"
horizontal-scroll-proportion="0.24401914" selected="true">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="44"
column="0" vertical-scroll-proportion="0.68585134" horizontal-scroll-proportion="0.0"
selected="true">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="715"
column="0" vertical-scroll-proportion="0.23980816" horizontal-scroll-proportion="0.0">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="182"
column="0" vertical-scroll-proportion="0.8417266" horizontal-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -72,7 +72,7 @@
</open-files>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="3" width="1288" height="1025" extended-state="0" />
+ <frame x="1275" y="0" width="1288" height="1025" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
@@ -294,18 +294,18 @@
<component name="ProjectViewSettings">
<navigator currentView="ProjectPane" flattenPackages="false"
showMembers="false" showStructure="false" autoscrollToSource="false"
splitterProportion="0.5" />
<view id="ProjectPane">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache/maven" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
</view>
<view id="SourcepathPane" />
<view id="ClasspathPane" />
1.15 +55 -38
maven-components/maven-model/src/java/org/apache/maven/model/Model.java
Index: Model.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Model.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Model.java 4 Dec 2003 08:04:12 -0000 1.14
+++ Model.java 7 Dec 2003 15:03:18 -0000 1.15
@@ -58,9 +58,7 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
@@ -153,12 +151,6 @@
/** Branches associated with this project. */
private List branches;
- /**
- * Distributions map that associates the distribution ids
- * with the distribution objects.
- */
- private HashMap versionMap;
-
/** POM to extend. */
private String pomToExtend;
@@ -188,25 +180,6 @@
*/
public Model()
{
- dependencies = new ArrayList();
-
- mailingLists = new ArrayList();
-
- developers = new ArrayList();
-
- contributors = new ArrayList();
-
- licenses = new ArrayList();
-
- versions = new ArrayList();
-
- versionMap = new HashMap();
-
- branches = new ArrayList();
-
- reports = new ArrayList();
-
- packageGroups = new ArrayList();
}
// ----------------------------------------------------------------------
@@ -436,7 +409,7 @@
*/
public void addDependency( Dependency dependency )
{
- dependencies.add( dependency );
+ getDependencies().add( dependency );
}
/**
@@ -456,6 +429,11 @@
*/
public List getDependencies()
{
+ if ( dependencies == null )
+ {
+ dependencies = new ArrayList();
+ }
+
return dependencies;
}
@@ -466,7 +444,7 @@
*/
public void addReport( String report )
{
- if ( reports.contains( report ) == false )
+ if ( getReports().contains( report ) == false )
{
reports.add( report );
}
@@ -489,6 +467,11 @@
*/
public List getReports()
{
+ if ( reports == null )
+ {
+ reports = new ArrayList();
+ }
+
return reports;
}
@@ -520,7 +503,7 @@
*/
public void addMailingList( MailingList mailingList )
{
- mailingLists.add( mailingList );
+ getMailingLists().add( mailingList );
}
/**
@@ -540,6 +523,11 @@
*/
public List getMailingLists()
{
+ if ( mailingLists == null )
+ {
+ mailingLists = new ArrayList();
+ }
+
return mailingLists;
}
@@ -550,7 +538,7 @@
*/
public void addDeveloper( Developer developer )
{
- developers.add( developer );
+ getDevelopers().add( developer );
}
/**
@@ -570,6 +558,11 @@
*/
public List getDevelopers()
{
+ if ( developers == null )
+ {
+ developers = new ArrayList();
+ }
+
return developers;
}
@@ -590,7 +583,7 @@
*/
public void addContributor( Contributor contributor )
{
- contributors.add( contributor );
+ getContributors().add( contributor );
}
/**
@@ -600,6 +593,11 @@
*/
public List getContributors()
{
+ if ( contributors == null )
+ {
+ contributors = new ArrayList();
+ }
+
return contributors;
}
@@ -620,7 +618,7 @@
*/
public void addLicense( License license )
{
- licenses.add( license );
+ getLicenses().add( license );
}
/**
@@ -630,6 +628,11 @@
*/
public List getLicenses()
{
+ if ( licenses == null )
+ {
+ licenses = new ArrayList();
+ }
+
return licenses;
}
@@ -825,8 +828,7 @@
*/
public void addVersion( Version version )
{
- versions.add( version );
- versionMap.put( version.getTag(), version );
+ getVersions().add( version );
}
/**
@@ -846,6 +848,11 @@
*/
public List getVersions()
{
+ if ( versions == null )
+ {
+ versions = new ArrayList();
+ }
+
return versions;
}
@@ -877,6 +884,11 @@
*/
public List getPackageGroups()
{
+ if ( packageGroups == null )
+ {
+ packageGroups = new ArrayList();
+ }
+
return packageGroups;
}
@@ -898,7 +910,7 @@
*/
public void addPackageGroup( PackageGroup packageGroup )
{
- packageGroups.add( packageGroup );
+ getPackageGroups().add( packageGroup );
}
public void setBranches( List branches )
@@ -911,6 +923,11 @@
*/
public List getBranches()
{
+ if ( branches == null )
+ {
+ branches = new ArrayList();
+ }
+
return branches;
}
@@ -920,6 +937,6 @@
*/
public void addBranch( Branch b )
{
- branches.add( b );
+ getBranches().add( b );
}
}
1.2 +23 -1
maven-components/maven-model/src/test/org/apache/maven/model/ModelTest.java
Index: ModelTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model/src/test/org/apache/maven/model/ModelTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelTest.java 4 Dec 2003 08:13:41 -0000 1.1
+++ ModelTest.java 7 Dec 2003 15:03:18 -0000 1.2
@@ -24,6 +24,28 @@
{
Model model = new Model();
+ // Values to be found before anything is added
+
+ assertNotNull( model.getMailingLists() );
+
+ assertNotNull( model.getBranches() );
+
+ assertNotNull( model.getVersions() );
+
+ assertNotNull( model.getDevelopers() );
+
+ assertNotNull( model.getContributors() );
+
+ assertNotNull( model.getReports() );
+
+ assertNotNull( model.getDependencies() );
+
+ assertNotNull( model.getPackageGroups() );
+
+ assertNotNull( model.getLicenses() );
+
+ // Test set values
+
model.setName( "name" );
assertEquals( "name", model.getName() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
