Subversion Repository Public Repository

litesoft

Diff Revisions 947 vs 948 for /trunk/Java/GWT/OldClient/src/org/litesoft/GWT/eventbus/client/nonpublic/TimerNode.java

Diff revisions: vs.
  @@ -4,42 +4,35 @@
4 4 import org.litesoft.GWT.eventbus.client.*;
5 5 import org.litesoft.commonfoundation.base.*;
6 6
7 - public class TimerNode
8 - {
7 + public class TimerNode {
9 8 private TimerNode mPrev = null;
10 9 private TimerNode mNext = null;
11 10 private long mFireWhen;
12 11 private int mClientIdNumber;
13 12 private EventPackage mParcel;
14 13
15 - public TimerNode( int pFireInMilliSecs, int pClientIdNumber, EventPackage pPackage )
16 - {
14 + public TimerNode( int pFireInMilliSecs, int pClientIdNumber, EventPackage pPackage ) {
17 15 long now = MillisecTimeSource.INSTANCE.now();
18 16 mFireWhen = now + pFireInMilliSecs;
19 17 mClientIdNumber = pClientIdNumber;
20 - if ( null == (mParcel = pPackage) )
21 - {
18 + if ( null == (mParcel = pPackage) ) {
22 19 throw new IllegalArgumentException( "Parcel may not be null" );
23 20 }
24 21 }
25 22
26 - public long getFireWhen()
27 - {
23 + public long getFireWhen() {
28 24 return mFireWhen;
29 25 }
30 26
31 - public int getClientIdNumber()
32 - {
27 + public int getClientIdNumber() {
33 28 return mClientIdNumber;
34 29 }
35 30
36 - public EventPackage getParcel()
37 - {
31 + public EventPackage getParcel() {
38 32 return mParcel;
39 33 }
40 34
41 - public boolean isBefore( TimerNode pTimerNode )
42 - {
35 + public boolean isBefore( TimerNode pTimerNode ) {
43 36 return (pTimerNode != null) && (this.mFireWhen < pTimerNode.mFireWhen);
44 37 }
45 38
  @@ -48,16 +41,13 @@
48 41 *
49 42 * @return mNext
50 43 */
51 - public TimerNode remove()
52 - {
44 + public TimerNode remove() {
53 45 // x - this - y
54 46 TimerNode rv = this.mNext;
55 - if ( this.mPrev != null )
56 - {
47 + if ( this.mPrev != null ) {
57 48 mPrev.mNext = this.mNext;
58 49 }
59 - if ( this.mNext != null )
60 - {
50 + if ( this.mNext != null ) {
61 51 mNext.mPrev = this.mPrev;
62 52 }
63 53 mPrev = mNext = null;
  @@ -72,15 +62,12 @@
72 62 *
73 63 * @return pNewTimerNode
74 64 */
75 - public TimerNode insertBeforeMe( TimerNode pNewTimerNode )
76 - {
65 + public TimerNode insertBeforeMe( TimerNode pNewTimerNode ) {
77 66 // x - this - y
78 - if ( chk( pNewTimerNode ) )
79 - {
67 + if ( chk( pNewTimerNode ) ) {
80 68 pNewTimerNode.mNext = this;
81 69 pNewTimerNode.mPrev = this.mPrev;
82 - if ( this.mPrev != null )
83 - {
70 + if ( this.mPrev != null ) {
84 71 this.mPrev.mNext = pNewTimerNode;
85 72 }
86 73 this.mPrev = pNewTimerNode;
  @@ -94,14 +81,11 @@
94 81 *
95 82 * @param pNewTimerNode may NOT have its links set
96 83 */
97 - public void insertAfterMe( TimerNode pNewTimerNode )
98 - {
84 + public void insertAfterMe( TimerNode pNewTimerNode ) {
99 85 // x - this - y
100 - if ( chk( pNewTimerNode ) )
101 - {
86 + if ( chk( pNewTimerNode ) ) {
102 87 pNewTimerNode.mNext = this.mNext;
103 - if ( this.mNext != null )
104 - {
88 + if ( this.mNext != null ) {
105 89 this.mNext.mPrev = pNewTimerNode;
106 90 }
107 91 this.mNext = pNewTimerNode;
  @@ -110,14 +94,11 @@
110 94 // x - this - pNewTimerNode - y
111 95 }
112 96
113 - private boolean chk( TimerNode pNewTimerNode )
114 - {
115 - if ( pNewTimerNode == null )
116 - {
97 + private boolean chk( TimerNode pNewTimerNode ) {
98 + if ( pNewTimerNode == null ) {
117 99 return false;
118 100 }
119 - if ( (pNewTimerNode.mPrev != null) || (pNewTimerNode.mNext != null) )
120 - {
101 + if ( (pNewTimerNode.mPrev != null) || (pNewTimerNode.mNext != null) ) {
121 102 throw new IllegalArgumentException( "NewTimerNode has non-Null links" );
122 103 }
123 104 return true;
  @@ -126,26 +107,20 @@
126 107 /**
127 108 * @return the New Head
128 109 */
129 - public static TimerNode addTo( TimerNode pCurrentHead, TimerNode pNewTimerNode )
130 - {
131 - if ( pNewTimerNode == null )
132 - {
110 + public static TimerNode addTo( TimerNode pCurrentHead, TimerNode pNewTimerNode ) {
111 + if ( pNewTimerNode == null ) {
133 112 return pCurrentHead;
134 113 }
135 - if ( pCurrentHead == null )
136 - {
114 + if ( pCurrentHead == null ) {
137 115 return pNewTimerNode;
138 116 }
139 - if ( pNewTimerNode.isBefore( pCurrentHead ) )
140 - {
117 + if ( pNewTimerNode.isBefore( pCurrentHead ) ) {
141 118 return pCurrentHead.insertBeforeMe( pNewTimerNode );
142 119 }
143 120 TimerNode cur = pCurrentHead;
144 - while ( cur.mNext != null )
145 - {
121 + while ( cur.mNext != null ) {
146 122 cur = cur.mNext;
147 - if ( pNewTimerNode.isBefore( cur ) )
148 - {
123 + if ( pNewTimerNode.isBefore( cur ) ) {
149 124 cur.insertBeforeMe( pNewTimerNode );
150 125 return pCurrentHead;
151 126 }