[Jython-checkins] SF.net SVN: jython:[7006] trunk/jython/src/org/python/modules/synchronize. java

[<pj...@us...>]

Revision: 7006
          http://jython.svn.sourceforge.net/jython/?rev=7006&view=rev
Author:   pjenvey
Date:     2010-04-09 03:01:56 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/jython/src/org/python/modules/synchronize.java

Modified: trunk/jython/src/org/python/modules/synchronize.java
===================================================================
--- trunk/jython/src/org/python/modules/synchronize.java	2010-04-09 02:54:17 UTC (rev 7005)
+++ trunk/jython/src/org/python/modules/synchronize.java	2010-04-09 03:01:56 UTC (rev 7006)
@@ -1,27 +1,31 @@
-// Copyright (c) Corporation for National Research Initiatives
+/*
+ * Copyright (c) Corporation for National Research Initiatives
+ * Copyright (c) Jython Developers
+ */
 package org.python.modules;
-import org.python.core.*;
 
-public class synchronize
-{
+import org.python.core.__builtin__;
+import org.python.core.PyDictionary;
+import org.python.core.PyObject;
+import org.python.core.PyMethod;
+import org.python.core.Py;
+
+public class synchronize {
+
     public static Object _getSync(PyObject obj) {
         return Py.tojava(obj, Object.class);
     }
 
-    public static PyObject apply_synchronized(PyObject sync_object,
-                                              PyObject callable,
-                                              PyObject args)
-    {
-        synchronized (_getSync(sync_object)) {
+    public static PyObject apply_synchronized(PyObject syncObject, PyObject callable,
+                                              PyObject args) {
+        synchronized (_getSync(syncObject)) {
+
             return __builtin__.apply(callable, args);
         }
     }
-    public static PyObject apply_synchronized(PyObject sync_object,
-                                              PyObject callable,
-                                              PyObject args,
-                                              PyDictionary kws)
-    {
-        synchronized (_getSync(sync_object)) {
+    public static PyObject apply_synchronized(PyObject syncObject, PyObject callable,
+                                              PyObject args, PyDictionary kws) {
+        synchronized (_getSync(syncObject)) {
             return __builtin__.apply(callable, args, kws);
         }
     }
@@ -30,58 +34,60 @@
         return new SynchronizedCallable(callable);
     }
 
-    public static class SynchronizedCallable extends PyObject
-    {
+    public static class SynchronizedCallable extends PyObject {
+
         PyObject callable;
 
         public SynchronizedCallable(PyObject callable) {
             this.callable = callable;
         }
 
-        public PyObject _doget(PyObject container) {
-            // TBD: third arg == null?  Hmm...
-            return new PyMethod(this, container, null);
+        @Override
+        public PyObject __get__(PyObject obj, PyObject type) {
+            return new PyMethod(this, obj, type);
         }
 
+        @Override
         public PyObject __call__() {
             throw Py.TypeError("synchronized callable called with 0 args");
         }
 
+        @Override
         public PyObject __call__(PyObject arg) {
-            synchronized(synchronize._getSync(arg)) {
+            synchronized (synchronize._getSync(arg)) {
                 return callable.__call__(arg);
             }
         }
 
+        @Override
         public PyObject __call__(PyObject arg1, PyObject arg2) {
-            synchronized(synchronize._getSync(arg1)) {
+            synchronized (synchronize._getSync(arg1)) {
                 return callable.__call__(arg1, arg2);
             }
         }
 
+        @Override
         public PyObject __call__(PyObject arg1, PyObject arg2, PyObject arg3) {
-            synchronized(synchronize._getSync(arg1)) {
+            synchronized (synchronize._getSync(arg1)) {
                 return callable.__call__(arg1, arg2, arg3);
             }
         }
 
+        @Override
         public PyObject __call__(PyObject[] args, String[] keywords) {
             if (args.length == 0) {
                 throw Py.TypeError("synchronized callable called with 0 args");
             }
-            synchronized(synchronize._getSync(args[0])) {
+            synchronized (synchronize._getSync(args[0])) {
                 return callable.__call__(args, keywords);
             }
         }
 
-        public PyObject __call__(PyObject arg1, PyObject[] args,
-                                 String[] keywords)
-        {
-            synchronized(synchronize._getSync(arg1)) {
+        @Override
+        public PyObject __call__(PyObject arg1, PyObject[] args, String[] keywords) {
+            synchronized (synchronize._getSync(arg1)) {
                 return callable.__call__(arg1, args, keywords);
             }
         }
-
-
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.