maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r683967 - in /maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model: ./ impl/
Date Fri, 08 Aug 2008 13:59:04 GMT
Author: brett
Date: Fri Aug  8 06:59:03 2008
New Revision: 683967

URL: http://svn.apache.org/viewvc?rev=683967&view=rev
Log:
licenses, generics

Modified:
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
    maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/DataSourceException.java
Fri Aug  8 06:59:03 2008
@@ -22,7 +22,7 @@
 import java.io.IOException;
 
 /**
- * Exeception class whose instance is thrown if there is an illegal state within a data source.
+ * Exception class whose instance is thrown if there is an illegal state within a data source.
  */
 public class DataSourceException
     extends IOException

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ImportModel.java
Fri Aug  8 06:59:03 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.util.List;
 
 public interface ImportModel {

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelContainerFactory.java
Fri Aug  8 06:59:03 2008
@@ -30,9 +30,9 @@
 {
 
     /**
-     * Returns collection of URIs asscociated with this factory.
+     * Returns collection of URIs associated with this factory.
      *
-     * @return collection of URIs asscociated with this factory
+     * @return collection of URIs associated with this factory
      */
     Collection<String> getUris();
 

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelDataSource.java
Fri Aug  8 06:59:03 2008
@@ -30,7 +30,7 @@
 
     /**
      * Join model properties of the specified container a with the specified container b.
Any elements of model container
-     * a must take precendence over model container b. All elements of model container A
must exist in the data source;
+     * a must take precedence over model container b. All elements of model container A must
exist in the data source;
      * elements of model container b may or may not exist.
      *
      * @param a model container with precedence

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
Fri Aug  8 06:59:03 2008
@@ -72,7 +72,7 @@
 
         if ( collections == null )
         {
-            collections = Collections.EMPTY_SET;
+            collections = Collections.emptySet();
         }
 
         List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelPropertyTransformer.java
Fri Aug  8 06:59:03 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.util.List;
 
 public interface ModelPropertyTransformer {

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
Fri Aug  8 06:59:03 2008
@@ -63,7 +63,14 @@
      */
     public ModelTransformerContext( Collection<ModelContainerFactory> factories )
     {
-        this.factories = ( factories == null ) ? Collections.EMPTY_LIST : factories;
+        if ( factories == null )
+        {
+            this.factories = Collections.emptyList();
+        }
+        else
+        {
+            this.factories = factories;
+        }
     }
 
     /**

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/DefaultModelDataSource.java
Fri Aug  8 06:59:03 2008
@@ -182,7 +182,7 @@
 
         if ( modelProperties.isEmpty() )
         {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         ModelContainerFactory factory = modelContainerFactoryMap.get( uri );

Modified: maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java?rev=683967&r1=683966&r2=683967&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
(original)
+++ maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/impl/XmlImportModel.java
Fri Aug  8 06:59:03 2008
@@ -1,5 +1,24 @@
 package org.apache.maven.shared.model.impl;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.apache.maven.shared.model.ImportModel;
 import org.apache.maven.shared.model.ModelProperty;
 import org.apache.maven.shared.model.ModelMarshaller;



Mime
View raw message