Changeset 86 for java/main/src/main/java/com/framsticks/parsers/MultiParamLoader.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/parsers/MultiParamLoader.java (modified) (18 diffs)

java/main/src/main/java/com/framsticks/parsers/MultiParamLoader.java

@@ -9 +9 @@
 
 public class MultiParamLoader {
-        private final static Logger logger = Logger
-                        .getLogger(MultiParamLoader.class.getName());
+        private final static Logger log = Logger.getLogger(MultiParamLoader.class);
 
         /**
@@ -56 +55 @@
          * Status of current execution.
          */
-        private Status status;
+        private Status status = Status.None;
+
+        private void setStatus(Status status) {
+                log.trace("changing status: " + this.status.toString() + " -> " + status.toString());
+                this.status = status;
+        }
 
         /**
@@ -62 +66 @@
          */
         private SourceInterface currentSource;
+
+        protected String currentLine;
 
 
@@ -86 +92 @@
         private String lastUnknownObjectName;
 
+        /**
+         * @return the currentLine
+         */
+        public String getCurrentLine() {
+                return currentLine;
+        }
+
         public MultiParamLoader() {
 
@@ -94 +107 @@
          */
         public Status go() throws Exception {
-                logger.trace("go");
+                log.trace("go");
 
                 while (!isFinished()) {
@@ -106 +119 @@
 
                         // read data
-                        String line = currentSource.readLine();
+                        currentLine = currentSource.readLine();
 
                         // end of file
-                        if (line == null) {
+                        if (currentLine == null) {
                                 if (!returnFromIncluded()) {
                                         finish();
@@ -117 +130 @@
                                 }
                         }
+                        log.trace("read line: " + currentLine);
 
                         // empty line
-                        if (line.length() == 0) {
+                        if (currentLine.length() == 0) {
                                 continue;
                         }
 
                         // check if some file should be included
-                        if (isIncludeLine(line) == LoopAction.Continue) {
+                        if (isIncludeLine(currentLine) == LoopAction.Continue) {
                                 continue;
                         }
 
                         // check if should break on comment
-                        if (isCommentLine(line) == LoopAction.Break) {
+                        if (isCommentLine(currentLine) == LoopAction.Break) {
                                 break;
                         }
 
                         // get class getName
-                        if (changeCurrentParamInterface(line) == LoopAction.Break) {
+                        LoopAction action = changeCurrentParamInterface(currentLine);
+                        if (action == LoopAction.Break) {
                                 break;
                         }
+                        if (action == LoopAction.Continue) {
+                                continue;
+                        }
+                        log.warn("unknown line: " + currentLine);
                 }
 
@@ -145 +164 @@
          * Checks whether the reader found a known or unknown object and execution
          * should be passed to it.
+         * @throws Exception
          */
         private LoopAction tryReadObject() throws Exception {
@@ -150 +170 @@
                                 || (status == Status.BeforeUnknown && lastAccessInterface != null)) {
                         // found object - let it load data
-            if (lastAccessInterface.getSelected() == null) {
-                lastAccessInterface.select(lastAccessInterface.createAccessee());
-            }
+                        if (lastAccessInterface.getSelected() == null) {
+                                lastAccessInterface.select(lastAccessInterface.createAccessee());
+                        }
+                        log.trace("loading into " + lastAccessInterface);
                         lastAccessInterface.load(currentSource);
 
@@ -162 +183 @@
                         return LoopAction.Continue;
                 } else if (status == Status.BeforeUnknown) {
-                        logger.info("Omitting unknown object: " + lastUnknownObjectName);
+                        log.warn("omitting unknown object: " + lastUnknownObjectName);
 
                         // found unknown object
                         emptyParam.load(currentSource);
-                        status = Status.AfterObject;
+                        setStatus(Status.AfterObject);
 
                         return LoopAction.Continue;
@@ -185 +206 @@
                                         int beg = line.indexOf('\"');
                                         if (beg == -1) {
-                                                logger.info("Wanted to include some file, but the format is incorrect");
+                                                log.info("Wanted to include some file, but the format is incorrect");
                                                 return LoopAction.Continue;
                                         }
@@ -192 +213 @@
                                         int end = includeFileName.indexOf('\"');
                                         if (end == -1) {
-                                                logger.info("Wanted to include some file, but the format is incorrect");
+                                                log.info("Wanted to include some file, but the format is incorrect");
                                                 return LoopAction.Continue;
                                         }
@@ -235 +256 @@
                         if (lastAccessInterface != null) {
                                 if (isBreakCondition(Status.BeforeObject)) {
-                                        logger.info("Breaking before object");
+                                        log.debug("breaking before object");
                                         return LoopAction.Break;
+                                } else {
+                                        return LoopAction.Continue;
                                 }
                         } else {
                                 lastUnknownObjectName = typeName;
                                 if (isBreakCondition(Status.BeforeUnknown)) {
-                                        logger.info("Breaking before unknown");
+                                        log.debug("breaking before unknown");
                                         return LoopAction.Break;
+                                } else {
+                                        return LoopAction.Continue;
                                 }
                         }
@@ -279 +304 @@
 
         private void finish() {
+                log.trace("finishing");
                 if (currentSource != null) {
                         currentSource.close();
                 }
 
-                status = Status.Finished;
+                setStatus(Status.Finished);
         }
 
@@ -291 +317 @@
 
         public boolean setNewSource(SourceInterface source) {
-                logger.debug("switching current source to " + source.getFilename() + "...");
+                log.debug("switching current source to " + source.getFilename() + "...");
 
                 currentSource = source;
-                status = Status.Loading;
+                setStatus(Status.Loading);
 
                 return true;
@@ -311 +337 @@
                 // check if it is already included and break if it is
                 if (isAlreadyIncluded(includeFilename)) {
-                        logger.debug("circular reference ignored (" + includeFilename
+                        log.debug("circular reference ignored (" + includeFilename
                                         + ")");
                         return;
                 }
 
-                logger.info("including file " + includeFilename + "...");
+                log.info("including file " + includeFilename + "...");
 
                 SourceInterface newSource = currentSource.openInclude(includeFilename);
@@ -335 +361 @@
                 for (String file : fileStack) {
                         if (filename.equals(file)) {
-                                logger.warn("file " + filename + " was already included");
+                                log.warn("file " + filename + " was already included");
                                 return true;
                         }
@@ -366 +392 @@
          */
         private boolean isBreakCondition(Status condition) {
-                status = condition;
+                setStatus(condition);
                 return breakConditions.contains(condition);
         }
 
         public Object returnObject() {
+                assert lastAccessInterface != null;
                 Object result = lastAccessInterface.getSelected();
                 if (result == null) {
                         return null;
                 }
-        lastAccessInterface.select(null);
+                lastAccessInterface.select(null);
                 return result;
         }