Changeset 86 for java/main/src/main/java/com/framsticks/params/ListSource.java

Timestamp:

06/26/13 13:27:31 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• use java annotations to mark classes and fields to be used when:
  • using java classes with ReflectionAccess? to represent remote objects with FramsClass? description found by "info ..." requests
  • to build up FramsClass? representation of objects not present at remote server
• allow using primitive types (instead of wraping counterparts) in reflected classes
• rework FramsClass? creation process (add FramsClassBuilder?)
• add more tests

CHANGELOG:
Prepare model.World class.

Minor change.

Use primitive types for Genotype and Creature classes.

Use primitive types in model.Neuro* classes.

Use primitive types in model.Joint* classes.

Use primitive types in model.Part* classes.

Fix primitive values.

Extract FramsClassBuilder?.

Add tests of Model classes.

More fixes.

Refactorize out ParamCandidate?.

Several fixes.

Fix all regressions after introducing annotations.

Use annotations throughout the project.

Add exception classes.

Improve creation of FramsClass?.

More changes.

Many changes regarding annotations.

Annotate classes in com.framsticks.model package.

Remove manual FramsClass? constructor.

Construct FramsClass? for Creature. Add test.

Add default values to the ParamAnnotation?.

Add ParamBuilderTest? and ParamAnnotation?.

Add FramsClassAnnotation?.

File:

• java/main/src/main/java/com/framsticks/params/ListSource.java (modified) (3 diffs)

java/main/src/main/java/com/framsticks/params/ListSource.java

@@ -1 +1 @@
 package com.framsticks.params;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -7 +8 @@
 
         private Iterator<String> iterator = null;
-    //private final List<String> source;
+        //private final List<String> source;
 
         public ListSource(List<String> source) {
-        //this.source = source;
-        iterator = source.iterator();
+                //this.source = source;
+                iterator = source.iterator();
         }
 
-    @Override
+        @Override
         public String getFilename() {
                 return "<net>";
         }
 
-    @Override
-    public String readLine() {
-        assert iterator != null;
+        @Override
+        public String readLine() {
+                // if (iterator == null) {
+                //      return null;
+                // }
+                assert iterator != null;
                 if (iterator.hasNext()) {
                         return iterator.next();
@@ -28 +32 @@
         }
 
-    @Override
-    public String demangleInclude(String include) {
+        @Override
+        public String demangleInclude(String include) {
                 return null;
         }
 
-    @Override
-    public SourceInterface openInclude(String include) {
+        @Override
+        public SourceInterface openInclude(String include) {
                 return null;
         }
 
-    @Override
-    public void close() {
-        iterator = null;
+        @Override
+        public void close() {
+                iterator = null;
+        }
+
+        public static ListSource createFrom(String... lines) {
+                List<String> list = new ArrayList<String>();
+                for (String l : lines) {
+                        list.add(l);
+                }
+                return new ListSource(list);
+        }
+
+        @Override
+        public boolean isClosed() {
+                return iterator == null;
         }
 }