geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r659605 - in /geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model: application/Application.java common/DependencySupport.java plugin/Plugin.java settings/Settings.java
Date Fri, 23 May 2008 17:47:58 GMT
Author: jdillon
Date: Fri May 23 10:47:57 2008
New Revision: 659605

URL: http://svn.apache.org/viewvc?rev=659605&view=rev
Log:
Properties are collections to, and accessors should not return null

Modified:
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java?rev=659605&r1=659604&r2=659605&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
Fri May 23 10:47:57 2008
@@ -111,6 +111,10 @@
     }
 
     public Properties getProperties() {
+        if (properties == null) {
+            properties = new Properties();
+        }
+
         return properties;
     }
 
@@ -171,7 +175,7 @@
 
         list.addAll(dependencies);
 
-        for (DependencyGroup group : dependencyGroups) {
+        for (DependencyGroup group : dependencyGroups()) {
             list.addAll(group.dependencies());
         }
 

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java?rev=659605&r1=659604&r2=659605&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
Fri May 23 10:47:57 2008
@@ -37,6 +37,8 @@
 
     private String version;
 
+    // TODO: optional? Any other stuff?
+
     public String getGroupId() {
         return groupId;
     }

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java?rev=659605&r1=659604&r2=659605&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
Fri May 23 10:47:57 2008
@@ -53,8 +53,8 @@
     
     private List<Dependency> dependencies;
 
-    private List<DependencyGroup> dependencyGroups = new ArrayList<DependencyGroup>();
-
+    private List<DependencyGroup> dependencyGroups;
+    
     // Commands
     
     // Layout
@@ -84,6 +84,10 @@
     }
 
     public Properties getProperties() {
+        if (properties == null) {
+            properties = new Properties();
+        }
+
         return properties;
     }
 
@@ -122,7 +126,7 @@
 
         list.addAll(dependencies);
 
-        for (DependencyGroup group : dependencyGroups) {
+        for (DependencyGroup group : dependencyGroups()) {
             list.addAll(group.dependencies());
         }
 

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java?rev=659605&r1=659604&r2=659605&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
Fri May 23 10:47:57 2008
@@ -47,6 +47,10 @@
     // TODO: Paths
 
     public Properties getProperties() {
+        if (properties == null) {
+            properties = new Properties();
+        }
+
         return properties;
     }
 



Mime
View raw message