updated coding rules.

[utils] / system / general / src / test / java / org / wamblee / system / core / Environment.java

diff --git a/system/general/src/test/java/org/wamblee/system/core/Environment.java b/system/general/src/test/java/org/wamblee/system/core/Environment.java
index c1e72ac48807280eeaabc6d9bc9227585cb3920c..c202d1ab23d317e83701bd8ba71d90e555466810 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/core/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/core/Environment.java
@@ -23,16 +23,19 @@ import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.test.EventTracker;
 
-public class Environment extends AbstractComponent {
+public class Environment extends AbstractComponent<Object> {
 
        private static final ProvidedInterface[] provided(String aPrefix) {
                return new ProvidedInterface[] {
                                new DefaultProvidedInterface(aPrefix + "datasource", String.class),
                                new DefaultProvidedInterface(aPrefix + "integer", Integer.class) };
        }
+       
+       private static int COUNT = 0; 
 
-       private EventTracker<String> _tracker;
-       private double _random;
+       private EventTracker<String> tracker;
+       private double random;
+       private int integer; 
 
        public Environment() {
                this("environment");
@@ -44,18 +47,19 @@ public class Environment extends AbstractComponent {
        
        public Environment(String aName, String aPrefix) {
         super(aName, provided(aPrefix), new RequiredInterface[0]);
-        _random = Math.random();
+        random = Math.random();
+        integer = COUNT++;
     }
 
 
 
        public Environment(EventTracker aTracker) {
                this();
-               _tracker = aTracker;
+               tracker = aTracker;
        }
 
        public Integer getInteger() {
-               return 2;
+               return integer;
        }
 
        public String getString() {
@@ -67,22 +71,22 @@ public class Environment extends AbstractComponent {
                addInterface(getProvidedInterfaces().get(0), getString(), aScope);
                addInterface(getProvidedInterfaces().get(1), getInteger(), aScope);
                track("start." + getName());
-               return _random;
+               return random;
        }
 
        @Override
        protected void doStop(Object aRuntime) {
                track("stop." + getName());
-               if (_random != (Double) aRuntime) {
+               if (random != (Double) aRuntime) {
                        throw new IllegalArgumentException("Wrong runtime: expected "
-                                       + _random + " but got " + aRuntime);
+                                       + random + " but got " + aRuntime);
                }
        }
 
        private void track(String aString) {
-               if (_tracker == null) {
+               if (tracker == null) {
                        return;
                }
-               _tracker.eventOccurred(aString);
+               tracker.eventOccurred(aString);
        }
 }