Changeset 84 for java/main/src/main/java/com/framsticks/model/Model.java
- Timestamp:
- 06/22/13 21:51:33 (11 years ago)
- Location:
- java/main
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
java/main
-
Property
svn:ignore
set to
target
-
Property
svn:ignore
set to
-
java/main/src/main/java/com/framsticks/model/Model.java
r79 r84 1 1 package com.framsticks.model; 2 2 3 import com.framsticks.util.Casting; 4 import com.framsticks.util.Containers; 5 import com.framsticks.util.Orientation; 3 import com.framsticks.util.lang.Casting; 4 import com.framsticks.util.lang.Containers; 5 import com.framsticks.util.lang.IterableIterator; 6 import com.framsticks.util.math.Orientation; 6 7 import org.apache.log4j.Logger; 7 8 … … 15 16 public class Model { 16 17 17 private final static Logger LOGGER= Logger.getLogger(Model.class);18 private final static Logger log = Logger.getLogger(Model.class); 18 19 19 20 public Double startingEnergy; … … 53 54 Model f0Genotype = Casting.tryCast(Model.class, i.next()); 54 55 if (f0Genotype == null) { 55 LOGGER.fatal("first object is not a Model");56 log.fatal("first object is not a Model"); 56 57 return null; 57 58 } 58 while (i.hasNext()) { 59 Object object = i.next(); 59 for (Object object : new IterableIterator<Object>(i)) { 60 60 if (object instanceof Joint) { 61 61 f0Genotype.joints.add((Joint)object); … … 70 70 continue; 71 71 } 72 LOGGER.error("invalid class: " + object.getClass().getCanonicalName());72 log.error("invalid class: " + object.getClass().getCanonicalName()); 73 73 } 74 74
Note: See TracChangeset
for help on using the changeset viewer.