You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/11/16 21:06:56 UTC

svn commit: r1035773 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/ src/org/apache/subversion/javahl/type/

Author: hwright
Date: Tue Nov 16 20:06:56 2010
New Revision: 1035773

URL: http://svn.apache.org/viewvc?rev=1035773&view=rev
Log:
JavaHL: Move the Tristate class into the type package.

[ in subversion/bindings/javahl/ ]
* native/CreateJ.cpp,
  native/EnumMapper.cpp:
  Update references.

* src/org/apache/subversion/javahl/Tristate.java:
  Move from here...

* src/org/apache/subversion/javahl/type/Tristate.java:
  ...to here, update package name.

* src/org/apache/subversion/javahl/ChangePath.java:
  Update import statement.

Added:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/Tristate.java
      - copied, changed from r1035763, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
Removed:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
Modified:
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1035773&r1=1035772&r2=1035773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Tue Nov 16 20:06:56 2010
@@ -378,8 +378,8 @@ CreateJ::ChangedPath(const char *path, s
                                "(Ljava/lang/String;JLjava/lang/String;"
                                "L"JAVA_PACKAGE"/ChangePath$Action;"
                                "L"JAVA_PACKAGE"/type/NodeKind;"
-                               "L"JAVA_PACKAGE"/Tristate;"
-                               "L"JAVA_PACKAGE"/Tristate;)V");
+                               "L"JAVA_PACKAGE"/type/Tristate;"
+                               "L"JAVA_PACKAGE"/type/Tristate;)V");
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
     }

Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1035773&r1=1035772&r2=1035773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Tue Nov 16 20:06:56 2010
@@ -195,7 +195,8 @@ jobject EnumMapper::mapOperation(svn_wc_
 jobject EnumMapper::mapTristate(svn_tristate_t tristate)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/Tristate", (int) (tristate - svn_tristate_false));
+  return mapEnum(JAVA_PACKAGE"/type/Tristate",
+                 (int) (tristate - svn_tristate_false));
 }
 
 svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?rev=1035773&r1=1035772&r2=1035773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Tue Nov 16 20:06:56 2010
@@ -23,7 +23,7 @@
 
 package org.apache.subversion.javahl;
 
-import org.apache.subversion.javahl.type.NodeKind;
+import org.apache.subversion.javahl.type.*;
 
 public class ChangePath implements java.io.Serializable
 {

Copied: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/Tristate.java (from r1035763, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/Tristate.java?p2=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/Tristate.java&p1=subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java&r1=1035763&r2=1035773&rev=1035773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/Tristate.java Tue Nov 16 20:06:56 2010
@@ -21,7 +21,7 @@
  * @endcopyright
  */
 
-package org.apache.subversion.javahl;
+package org.apache.subversion.javahl.type;
 
 public enum Tristate
 {

Re: svn commit: r1035773 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/ src/org/apache/subversion/javahl/type/

Posted by Hyrum Wright <hw...@apache.org>.
On Tue, Nov 16, 2010 at 2:19 PM, Blair Zajac <bl...@orcaware.com> wrote:
> On 11/16/10 12:06 PM, hwright@apache.org wrote:
>>
>> Author: hwright
>> Date: Tue Nov 16 20:06:56 2010
>> New Revision: 1035773
>>
>> URL: http://svn.apache.org/viewvc?rev=1035773&view=rev
>> Log:
>> JavaHL: Move the Tristate class into the type package.
>
> Hyrum,
>
> Using "type" as a package name will cause compile failures if the bindingds
> are used in a Scala program as "type" is a reserved word, so having it
> appear in an import statement will cause problems.
>
> I suggest renaming "type" to to "types" so it's not a keyword in Scala.

Good suggestion.  I'll effect this change RSN.

-Hyrum

Re: svn commit: r1035773 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/ src/org/apache/subversion/javahl/type/

Posted by Blair Zajac <bl...@orcaware.com>.
On 11/16/10 12:06 PM, hwright@apache.org wrote:
> Author: hwright
> Date: Tue Nov 16 20:06:56 2010
> New Revision: 1035773
>
> URL: http://svn.apache.org/viewvc?rev=1035773&view=rev
> Log:
> JavaHL: Move the Tristate class into the type package.

Hyrum,

Using "type" as a package name will cause compile failures if the bindingds are 
used in a Scala program as "type" is a reserved word, so having it appear in an 
import statement will cause problems.

I suggest renaming "type" to to "types" so it's not a keyword in Scala.

Thanks,
Blair