From: adash Date: Wed, 30 Jan 2008 23:30:22 +0000 (+0000) Subject: make changes X-Git-Tag: preEdgeChange~291 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dd8630c940524484b5dfb382441cc2e9396fa232;p=IRC.git make changes --- diff --git a/Robust/src/Tests/Atomic4.java b/Robust/src/Tests/Atomic4.java index d883c0b9..3034dc33 100644 --- a/Robust/src/Tests/Atomic4.java +++ b/Robust/src/Tests/Atomic4.java @@ -7,27 +7,26 @@ public class Atomic4 extends Thread { int b = 0,c = 0; Integer age; - String name; Atomic4 at4 = null; + atomic { at4 = global new Atomic4(); at4.team = global new People[2]; at4.team[0] = global new People(); at4.team[1] = global new People(); + } + atomic { age = global new Integer(35); - name = global new String("Harry Potter"); - at4.team[0].name = name; at4.team[0].age = age; b = at4.team[0].getAge(); } atomic { age = global new Integer(70); - name = global new String("John Smith"); - at4.team[1].name = name; at4.team[1].age = age; c = at4.team[1].getAge(); } System.printInt(b); + System.printString("\n"); System.printInt(c); System.printString("\n"); System.printString("Starting\n"); @@ -39,17 +38,19 @@ public class Atomic4 extends Thread { } public int run() { - String newname = ""; int ag; boolean old = false; atomic { ag = team[1].getAge(); - newname = team[1].getName(); + //ag = team[0].getAge(); if(ag > 65) old = true; } if(old){ - System.printString(" gets Pension"); + System.printString("Gets Pension"); + System.printString("\n"); + } else { + System.printString("Gets No Pension"); System.printString("\n"); } }