incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r598049 - in /incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler: ./ impl/
Date Sun, 25 Nov 2007 20:46:29 GMT
Author: sisbell
Date: Sun Nov 25 12:46:28 2007
New Revision: 598049

URL: http://svn.apache.org/viewvc?rev=598049&view=rev
Log:
Changed return types: should use set instead of list, since ordering is not important but
duplication is. Stricter type-safeing on some other methods.

Modified:
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java
    incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java
Sun Nov 25 12:46:28 2007
@@ -1,7 +1,7 @@
 package org.apache.maven.dotnet.compiler;
 
 import java.io.File;
-import java.util.List;
+import java.util.Set;
 
 public interface Compiler
 {
@@ -22,32 +22,30 @@
     boolean failOnErrorOutput();
 
     /**
-      * Returns the commands that this compiler will use to compile the application. This
list is unmodifiable.
-      *
-      * @return the commands that this compiler will use to compile the application
-      */
-     List<String> getCommands();
-
-     /**
-      * Resets the commands to be used by the executable. This should only be used if the
executable is being reused with
-      * different commands from the one that it was initialized with.
-      *
-      * @param commands
-      */
-     void resetCommands(List<String> commands);
-
-     /**
-      * Compiles class files.
-      *
-      */
-     void compile();
-
-     /**
-      * Returns the executable file name that this compiler will use to compile the application.
-      *
-      * @return the executable file name that this compiler will use to compile the application
-      *
-      */
-     String getCompilerFileName();
+     * Returns the commands that this compiler will use to compile the application. This
list is unmodifiable.
+     *
+     * @return the commands that this compiler will use to compile the application
+     */
+    Set<String> getCommands();
+
+    /**
+     * Resets the commands to be used by the executable. This should only be used if the
executable is being reused with
+     * different commands from the one that it was initialized with.
+     *
+     * @param commands
+     */
+    void resetCommands( Set<String> commands );
+
+    /**
+     * Compiles class files.
+     */
+    void compile();
+
+    /**
+     * Returns the executable file name that this compiler will use to compile the application.
+     *
+     * @return the executable file name that this compiler will use to compile the application
+     */
+    String getCompilerFileName();
 
 }

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java
Sun Nov 25 12:46:28 2007
@@ -2,11 +2,9 @@
 
 public @interface CompilerAnnotation
 {
-    String getClassFileExtension();
+    ProgrammingLanguage getProgrammingLanguaqe();
 
-    String getLanguaqe();
+    Vendor getVendor();
 
-    String getVendor();
-
-    String getFrameworkVersion();
+    String getLanguageVersion();
 }

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java
Sun Nov 25 12:46:28 2007
@@ -67,8 +67,16 @@
      */
     File getTargetDirectory();
 
-    String getProgramLanguage();
+    ProgrammingLanguage getProgrammingLanguage();
 
-    void setProgramLanguage( String programLanguage );
+    void setProgrammingLanguage( ProgrammingLanguage programLanguage );
+
+    String getProgramLanguageVersion();
+
+    void setProgrammingLanguageVersion(String programLanguageVersion);
+
+    void setVendor(String vendor);
+
+    String getVendor();
 
 }

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java
Sun Nov 25 12:46:28 2007
@@ -1,5 +1,7 @@
 package org.apache.maven.dotnet.compiler;
 
+import java.net.URI;
+
 /**
  * Provides services for obtaining information about the key file.
  *
@@ -11,14 +13,14 @@
      *
      * @return the path of the key
      */
-    String getKeyFileUri();
+    URI getKeyFileUri();
 
     /**
      * Sets the path of the key
      *
      * @param keyFileUri the path of the key
      */
-    void setKeyFileUri(String keyFileUri);
+    void setKeyFileUri(URI keyFileUri);
 
     String getKeyContainerName();
 
@@ -42,15 +44,15 @@
         {
             return new KeyInfo()
             {
-                private String keyFileUri;
+                private URI keyFileUri;
 
                 private String keyContainerName;
 
-                public String getKeyFileUri() {
+                public URI getKeyFileUri() {
                     return keyFileUri;
                 }
 
-                public void setKeyFileUri(String keyFileUri) {
+                public void setKeyFileUri(URI keyFileUri) {
                     this.keyFileUri = keyFileUri;
                 }
 

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java
Sun Nov 25 12:46:28 2007
@@ -3,7 +3,7 @@
 import org.apache.maven.artifact.Artifact;
 
 import java.io.File;
-import java.util.List;
+import java.util.Set;
 
 public interface NetCompilerContext extends CompilerContext
 {
@@ -15,7 +15,7 @@
      *
      * @return assembly names that should be referenced by the compiler.
      */
-    List<String> getCoreAssemblyNames();
+    Set<String> getCoreAssemblyNames();
 
     /**
      * Returns a list of module (netmodule) dependencies that exist directly within the invoking
projects pom
@@ -23,28 +23,28 @@
      *
      * @return a list of module (netmodule) dependencies of the class files.
      */
-    List<Artifact> getDirectModuleDependencies();
+    Set<Artifact> getDirectModuleDependencies();
 
     /**
      * Returns a list of library (dll) dependencies of the class files.
      *
      * @return a list of library (dll) dependencies of the class files.
      */
-    List<Artifact> getLibraryDependencies();
+    Set<Artifact> getLibraryDependencies();
 
     /**
      * Returns a list of module (netmodule) dependencies of the class files.
      *
      * @return a list of module (netmodule) dependencies of the class files.
      */
-    List<Artifact> getModuleDependencies();
+    Set<Artifact> getModuleDependencies();
 
     /**
      * Returns a list of resources that the compiler should link to the compiled assembly
      *
      * @return a list of resources that the compiler should link to the compiled assembly
      */
-    List<File> getLinkedResources();
+    Set<File> getLinkedResources();
 
     /**
      * Returns a list of resources that the compiler should embed in the compiled assembly.
These may of any mime-type
@@ -52,7 +52,7 @@
      *
      * @return a list of resources that the compiler should embed in the compiled assembly.
      */
-    List<File> getEmbeddedResources();
+    Set<File> getEmbeddedResources();
 
     /**
      * Returns the icon that the assembly should display when viewed. Should not be used
in conjunction with win32res.
@@ -66,5 +66,5 @@
      *
      * @return a list of win32 resources.
      */
-    List<File> getWin32Resources();
+    Set<File> getWin32Resources();
 }

Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java?rev=598049&r1=598048&r2=598049&view=diff
==============================================================================
--- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
(original)
+++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java
Sun Nov 25 12:46:28 2007
@@ -4,42 +4,38 @@
 import org.apache.maven.dotnet.compiler.Compiler;
 import org.apache.maven.artifact.Artifact;
 
-import java.util.List;
+import java.util.Set;
 import java.io.File;
 
 public class NetCompilerContextImpl implements NetCompilerContext
-{
-    public List<String> getCoreAssemblyNames()
-    {
-        return null;
-    }
 
-    public List<Artifact> getDirectModuleDependencies()
+{
+    public Set<String> getCoreAssemblyNames()
     {
         return null;
     }
 
-    public KeyInfo getKeyInfo()
+    public Set<Artifact> getDirectModuleDependencies()
     {
         return null;
     }
 
-    public List<Artifact> getLibraryDependencies()
+    public Set<Artifact> getLibraryDependencies()
     {
         return null;
     }
 
-    public List<Artifact> getModuleDependencies()
+    public Set<Artifact> getModuleDependencies()
     {
         return null;
     }
 
-    public List<File> getLinkedResources()
+    public Set<File> getLinkedResources()
     {
         return null;
     }
 
-    public List<File> getEmbeddedResources()
+    public Set<File> getEmbeddedResources()
     {
         return null;
     }
@@ -49,13 +45,7 @@
         return null;
     }
 
-    public List<File> getWin32Resources()
-    {
-        return null;
-    }
-
-    public File getArtifact()
-        throws InvalidArtifactException
+    public Set<File> getWin32Resources()
     {
         return null;
     }



Mime
View raw message