Re: svn commit: r420418 - in /geronimo/specs/trunk: ./ geronimo-spec-commonj/src/main/java/commonj/timers/ geronimo-spec-commonj/src/main/java/commonj/work/

Mon, 10 Jul 2006 06:46:55 -0700 


On Jul 10, 2006, at 12:32 AM, Jason Dillon wrote:
You know... every field in an interface is by default public static and final. Adding these modifiers is redundant.
You're right, of course. They already had "redundant" 'public static'. The patch that Jeremy submitted added the 'final'. I was in match-the-code-with-the-javadoc mode... As they do no harm, I'll leave them in. 


On Jul 9, 2006, at 9:23 PM, [EMAIL PROTECTED] wrote:


Author: kevan
Date: Sun Jul  9 21:23:46 2006
New Revision: 420418

URL: http://svn.apache.org/viewvc?rev=420418&view=rev
Log:
GERONIMO-2179 Fix multiple signature problems with commonj specs

Modified:
geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/timers/TimerManager.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/RemoteWorkItem.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkCompletedException.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkEvent.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkItem.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkManager.java geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkRejectedException.java 
    geronimo/specs/trunk/pom.xml
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/timers/TimerManager.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/timers/TimerManager.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/timers/TimerManager.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/timers/TimerManager.java Sun Jul 9 21:23:46 2006 
@@ -35,12 +35,12 @@
  */
 public interface TimerManager {

-    static long IMMEDIATE = 0;
-    static long INDEFINITE = java.lang.Long.MAX_VALUE;
+    static final long IMMEDIATE = 0;
+    static final long INDEFINITE = java.lang.Long.MAX_VALUE;

-    boolean isStopped() throws IllegalStateException;
+    boolean isStopped();

-    boolean isStopping() throws IllegalStateException;
+    boolean isStopping();

     boolean isSuspended() throws IllegalStateException;
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/RemoteWorkItem.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/RemoteWorkItem.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/RemoteWorkItem.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/RemoteWorkItem.java Sun Jul 9 21:23:46 2006 
@@ -33,7 +33,7 @@
 /**
* @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ 
  */
-public interface RemoteWorkItem extends Comparable, WorkItem {
+public interface RemoteWorkItem extends WorkItem {

     WorkManager getPinnedWorkManager();
     void release();
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkCompletedException.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/ WorkCompletedException.java?rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkCompletedException.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkCompletedException.java Sun Jul 9 21:23:46 2006 
@@ -28,22 +28,45 @@

 package commonj.work;

+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+
 /**
* @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ 
  */
-public class WorkCompletedException extends Exception {
+public class WorkCompletedException extends WorkException {
+
+    private final List exceptionList;

     public WorkCompletedException() {
         super();
+        exceptionList = Collections.EMPTY_LIST;
     }
     public WorkCompletedException(String message) {
         super(message);
+        exceptionList = Collections.EMPTY_LIST;
     }
     public WorkCompletedException(String message, Throwable cause) {
         super(message, cause);
+        exceptionList = Collections.singletonList(cause);
     }
     public WorkCompletedException(Throwable cause) {
         super(cause);
+        exceptionList = Collections.singletonList(cause);
+    }
+    public WorkCompletedException(String message, List list) {
+        super(message);
+        if ((list != null) && (list.size() > 0)) {
+            initCause((Throwable) list.get(0));
+ exceptionList = Collections.unmodifiableList(new ArrayList(list)); 
+        } else {
+            exceptionList = Collections.EMPTY_LIST;
+        }
+    }
+
+    public List getExceptionList() {
+        return exceptionList;
     }

 }
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkEvent.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/WorkEvent.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkEvent.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkEvent.java Sun Jul 9 21:23:46 2006 
@@ -33,10 +33,10 @@
  */
 public interface WorkEvent {

-    static int WORK_ACCEPTED = 1;
-    static int WORK_COMPLETED = 4;
-    static int WORK_REJECTED = 2;
-    static int WORK_STARTED = 3;
+    static final int WORK_ACCEPTED = 1;
+    static final int WORK_REJECTED = 2;
+    static final int WORK_STARTED = 3;
+    static final int WORK_COMPLETED = 4;

     WorkException getException();
     int getType();
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkItem.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/WorkItem.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkItem.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkItem.java Sun Jul 9 21:23:46 2006 
@@ -33,7 +33,7 @@
  */
 public interface WorkItem extends Comparable {

-    Work getResult();
+    Work getResult() throws WorkException;
     int getStatus();

 }
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkManager.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/WorkManager.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkManager.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkManager.java Sun Jul 9 21:23:46 2006 
@@ -35,12 +35,12 @@
  */
 public interface WorkManager {

-    static long IMMEDIATE = 0;
-    static long INDEFINITE = java.lang.Long.MAX_VALUE;
+    static final long IMMEDIATE = 0;
+    static final long INDEFINITE = java.lang.Long.MAX_VALUE;

-    WorkItem schedule(Work work) throws IllegalArgumentException;
+ WorkItem schedule(Work work) throws WorkException, IllegalArgumentException;
- WorkItem schedule(Work work, WorkListener listener) throws IllegalArgumentException; + WorkItem schedule(Work work, WorkListener listener) throws WorkException, IllegalArgumentException; 

     boolean waitForAll(Collection workItems, long timeout)
         throws InterruptedException, IllegalArgumentException;
Modified: geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkRejectedException.java URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo- spec-commonj/src/main/java/commonj/work/WorkRejectedException.java? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= --- geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkRejectedException.java (original) +++ geronimo/specs/trunk/geronimo-spec-commonj/src/main/java/ commonj/work/WorkRejectedException.java Sun Jul 9 21:23:46 2006 
@@ -31,7 +31,7 @@
 /**
* @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ 
  */
-public class WorkRejectedException extends Exception {
+public class WorkRejectedException extends WorkException {


     public WorkRejectedException() {

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml? rev=420418&r1=420417&r2=420418&view=diff ===================================================================== ========= 
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Sun Jul  9 21:23:46 2006
@@ -39,7 +39,7 @@
     <geronimoSpecsVersion>1.2-SNAPSHOT</geronimoSpecsVersion>
<geronimoSpecsActivationVersion>1.1</ geronimoSpecsActivationVersion> 
-    <geronimoSpecsCommonjVersion>1.0</geronimoSpecsCommonjVersion>
+ <geronimoSpecsCommonjVersion>1.0.1-SNAPSHOT</ geronimoSpecsCommonjVersion> 
     <geronimoSpecsCorbaVersion>1.0</geronimoSpecsCorbaVersion>
     <geronimoSpecsCorba30Version>1.1</geronimoSpecsCorba30Version>
     <geronimoSpecsCorba23Version>1.1</geronimoSpecsCorba23Version>

Reply via email to