Changeset 78 for java/main/src/main/java/com/framsticks/params

Timestamp:

01/09/13 00:09:10 (11 years ago)

Author:

psniegowski

Message:

Add f0 parsing and f0->Model transformation.

Location:

java/main/src/main/java/com/framsticks/params

Files:

• AccessInterface.java (modified) (2 diffs)
• FramsClass.java (modified) (6 diffs)
• ListAccess.java (modified) (1 diff)
• Param.java (modified) (1 diff)
• PropertiesAccess.java (modified) (2 diffs)
• ReflectionAccess.java (modified) (7 diffs)
• Registry.java (added)
• SimpleAbstractAccess.java (modified) (3 diffs)
• Util.java (modified) (2 diffs)

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

@@ -80 +80 @@
 
         /**
-         * Load values from single line String.
-         * 
-         * @param line
-         *            the line with values
-         * @return the list of not severe exceptions which occurred while loading
-         * @throws Exception
-         *             the severe exception occurred while loading
-         */
-        List<Exception> load2(String line) throws Exception;
-
-        /**
          * Removes all the properties values.
          */
@@ -107 +96 @@
     FramsClass getFramsClass();
 
+
 }

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

@@ -5 +5 @@
 import com.framsticks.params.types.FloatParam;
 import com.framsticks.params.types.StringParam;
+import com.framsticks.parsers.FileSource;
+import com.framsticks.parsers.Loaders;
 import com.framsticks.util.Casting;
 import org.apache.log4j.Logger;
 
 import javax.lang.model.element.TypeElement;
+import java.io.InputStream;
 import java.lang.reflect.*;
 import java.util.*;
@@ -58 +61 @@
 
         public Collection<Param> getParamEntries() {
-                return paramEntryMap.values();
+                return paramList;
         }
 
@@ -214 +217 @@
                 }
             }
+                        if (rawType.equals(List.class)) {
+                                Type containedType = p.getActualTypeArguments()[0];
+                                if (containedType instanceof Class) {
+                                        return "l " + ((Class) containedType).getCanonicalName();
+                                }
+                        }
             return null;
         }
@@ -234 +243 @@
     public static final String GENERATE_HELP_PREFIX = "automatically generated from: ";
 
-
-
-    public static class Constructor {
+        public static FramsClass readFromStream(InputStream stream) {
+                return Loaders.loadFramsClass(new FileSource(stream));
+        }
+
+        public static class Constructor {
         protected final FramsClass result;
         protected Class currentClass;
@@ -249 +260 @@
                 currentClass = currentClass.getSuperclass();
             }
+                        currentClass = src;
         }
 
@@ -254 +266 @@
             return result;
         }
+
+                public Constructor allFields() {
+                        for (Field f : currentClass.getFields()) {
+                                field(f.getName());
+                        }
+                        return this;
+                }
 
         public Constructor method(String name, Class<?> ... arguments) {

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

@@ -73 +73 @@
         }
 
-        @Override
-        public List<Exception> load2(String line) throws Exception {
-                return null;
-        }
-
         public AccessInterface getElementAccess() {
                 return elementAccess;

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

@@ -109 +109 @@
         } catch (ClassCastException e) {
             throw new ClassCastException("property \"" + name
-                    + "\" getType is \"" + value.getClass().getName()
+                    + "\" type is \"" + value.getClass().getName()
                     + "\", not \"" + type.getName() + "\"");
         }

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

@@ -20 +20 @@
     @Override
         public Map<String, Object> createAccessee() {
+                return PropertiesAccess.createPropertiesMap();
+        }
+
+        public static Map<String, Object> createPropertiesMap() {
                 return new HashMap<String, Object>();
         }
-
 
         public PropertiesAccess(FramsClass framsClass) {
@@ -83 +86 @@
 
 
-
-
 }

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

@@ -3 +3 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
 import java.util.List;
 
@@ -43 +45 @@
                         String id = param.getId();
                         try {
-                                return type.cast(object.getClass().getField(id).get(object));
+                                return type.cast(reflectedClass.getField(id).get(object));
                         } catch (NoSuchFieldException ignored) {
                         }
                         try {
-                                return type.cast(object.getClass().getMethod(accessorName(true, id)).invoke(object));
+                                return type.cast(reflectedClass.getMethod(accessorName(true, id)).invoke(object));
                         } catch (NoSuchMethodException ex) {
                                 //ex.printStackTrace();
@@ -68 +70 @@
         }
 
-        private <T> void setValue(Param param, T val) {
+        private <T> void setValue(Param param, T value) {
                 if (object == null) {
                         return;
@@ -75 +77 @@
                         String id = param.getId();
                         try {
-                                object.getClass().getField(id).set(object, val);
+                                Field f = reflectedClass.getField(id);
+                                Class t = f.getType();
+                                if (Modifier.isFinal(f.getModifiers())) {
+                                        return;
+                                }
+                                if (value != null || (!t.isPrimitive())) {
+                                        f.set(object, value);
+                                }
                                 return;
                         } catch (NoSuchFieldException ignored) {
                         }
                         try {
-                                object.getClass().getMethod(accessorName(false, id), new Class[]{val.getClass()}).invoke(object, val);
-                        } catch (InvocationTargetException e) {
-                                //e.printStackTrace();
+                                reflectedClass.getMethod(accessorName(false, id), new Class[]{param.getStorageType()}).invoke(object, value);
+                        } catch (InvocationTargetException ignored) {
                         } catch (NoSuchMethodException ignored) {
                         }
-                } catch (IllegalAccessException ex) {
-                        LOGGER.warn("illegal access error occurred while trying to access returnedObject");
+                } catch (Exception ex) {
                         ex.printStackTrace();
                 }
@@ -103 +110 @@
                 resetErrors();
 
-                Field[] fields;
                 try {
-                        // TODO: conceptually invalid - should clean only fields that are specified in FramsClass
-                        fields = object.getClass().getFields();
-
-                        for (Field field : fields) {
-                                field.set(object, null);
+                        for (Param p : framsClass.getParamEntries()) {
+                                setValue(p, p.getDef(Object.class));
                         }
-                } catch (IllegalAccessException ex) {
-                        LOGGER.warn("IllegalAccessException thrown while trying to reset object values");
+                } catch (IllegalArgumentException ex) {
                         ex.printStackTrace();
                 }
@@ -125 +127 @@
         @Override
         public void select(Object object) {
+                assert object == null || reflectedClass.isInstance(object);
                 this.object = object;
         }
@@ -166 +169 @@
         }
         LOGGER.fatal("failed to create reflected object of class " + reflectedClass.getCanonicalName() + " for frams type " + framsClass.getId());
-
         return null;
     }

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

@@ -38 +38 @@
                 this.framsClass = framsClass;
         }
-
-
-
-
     /**
          * Simple String key, value class.
          */
-        private static class Entry {
-
-                String key;
-                String value;
-
-                Entry(String key, String value) {
+        public static class Entry {
+
+                public final String key;
+                public final String value;
+
+                public Entry(String key, String value) {
                         this.key = key;
                         this.value = value;
@@ -331 +327 @@
 
         Entry entry;
-
         while ((entry = readEntry(source)) != null) {
             Param param = getParam(entry.key);
@@ -351 +346 @@
     }
 
-    @Override
-        public List<Exception> load2(String line) throws Exception {
-                this.clearValues();
-
-                // list of not terminable exceptions that occured
-                List<Exception> exceptions = new ArrayList<Exception>();
-
-                int indexOfColon = line.indexOf(':');
-                if (indexOfColon < 0)
-                        indexOfColon = line.length();
-                String classId = line.substring(0, indexOfColon).trim();
-                if (!getId().equals(classId))
-                        throw new Exception(
-                                        "Inappropriate getId of param interface (class), specified \""
-                                                        + classId + "\" while should be \"" + getId()
-                                                        + "\"");
-                String parameters;
-                if (indexOfColon == line.length())
-                        parameters = "";
-                else
-                        parameters = line.substring(indexOfColon + 1);
-
-                // tokenize
-                boolean doubleQuotes = false;
-                char previousChar = ',';
-                List<Entry> result = new ArrayList<Entry>();
-                StringBuilder stringBuilder = new StringBuilder();
-                String key = "";
-                if (parameters.trim().length() > 0) {
-                        for (char currentChar : parameters.toCharArray()) {
-                                if (!doubleQuotes && currentChar == '=' && "".equals(key)) {
-                                        key = stringBuilder.toString();
-                                        stringBuilder = new StringBuilder();
-                                } else if (!doubleQuotes && currentChar == ',') {
-                                        if (previousChar == ',') {
-                                                result.add(new Entry(key.trim(), null));
-                                        } else {
-                                                result.add(new Entry(key.trim(), stringBuilder
-                                                                .toString().trim()));
-                                        }
-                                        stringBuilder = new StringBuilder();
-                                        key = "";
-                                } else if (currentChar == '"') {
-                                        if (previousChar == '\\') {
-                                                stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-                                                stringBuilder.append(currentChar);
-                                        } else
-                                                doubleQuotes = !doubleQuotes;
-                                } else {
-                                        stringBuilder.append(currentChar);
-                                }
-
-                                previousChar = currentChar;
-                        }
-
-                        String last = stringBuilder.toString().trim();
-                        // if (last.length() > 0 || previousChar == '\"'
-                        // || previousChar == ':')
-                        result.add(new Entry(key.trim(), last));
-
-                        if (doubleQuotes)
-                                throw new Exception(
-                                                "Double quotes expected while end of line met");
-                }
-
-                // if successfully parsed set all necessary values
-
-                //TODO: name omitting
-                Param currentParam = null;
-                boolean illegallyOmittedName = false;
-                for (Entry pair : result) {
-                        try {
-
-                                if (pair.key != null && !"".equals(pair.key)) {
-                                        Param param = getParam(pair.key);
-                                        if (param == null) {
-                                                illegallyOmittedName = true;
-                                                throw new Exception("No parameter with such id: "
-                                                                + pair.key);
-                                        } else {
-                                                currentParam = param;
-                                                illegallyOmittedName = false;
-                                        }
-                                } else if (illegallyOmittedName
-                                                || (currentParam.getFlags() & Flags.CANOMITNAME) == 0) {
-                                        throw new Exception(
-                                                        "Parameter with offset: "
-                                                                        + currentParam
-                                                                        + " is not set, "
-                                                                        + "because it's definition or definition of one of the previous params "
-                                                                        + "does not contain flag, which allow to skip the getName (flag 1024)");
-                                }
-
-                                if (pair.value != null) {
-                                        int setFlag = this.set(currentParam, pair.value);
-                                        if ((setFlag & Flags.PSET_HITMIN) != 0) {
-                                                exceptions.add(createBoundaryHitException(currentParam, pair.value, Flags.PSET_HITMIN));
-                                        }
-
-                                        if ((setFlag & Flags.PSET_HITMAX) != 0) {
-                                                exceptions.add(createBoundaryHitException(currentParam, pair.value, Flags.PSET_HITMAX));
-                                        }
-
-                                        if ((setFlag & Flags.PSET_RONLY) != 0) {
-                                                throw (new Exception(
-                                                                "Tried to set a read-only attribute \""
-                                                                                + currentParam.getId()
-                                                                                + "\" in class \"" + getId() + "\""));
-                                        }
-                                }
-
-                        } catch (Exception e) {
-                                exceptions.add(e);
-                        //} finally {
-                        //  currentProperty++;
-                        }
-                }
-                return exceptions;
-        }
-
-        private Exception createBoundaryHitException(Param param, String value, int flag) {
-                boolean minimum = (flag & Flags.PSET_HITMIN) != 0;
-                String boundary = (minimum ? param.getMin(Object.class) : param.getMax(Object.class)).toString();
-                String name =  (minimum ? "minimum" : "maximum");
-                return new Exception("Tried to set attribute \""
-                                + param.getId()
-                                + "\" in class \""
-                                + getId()
-                                + "\" to value which exceeds " + name + " ("
-                                + value
-                                + "), truncated to: "
-                                + boundary);
-        }
-        
+
+
         protected abstract <T> void internalSet(Param param, T value);
 

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

@@ -1 +1 @@
 package com.framsticks.params;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -14 +17 @@
         return result.toString();
     }
+        public static List<Object> stripAccessInterface(List<AccessInterface> accesses) {
+                List<Object> result = new ArrayList<Object>();
+                for (AccessInterface a : accesses) {
+                        result.add(a.getSelected());
+                }
+                return result;
+        }
+        public static int copyParams(AccessInterface to, AccessInterface from) {
+                int copied = 0;
+                for (Param f : from.getParams()) {
+                        Param t = from.getParam(f.getId());
+                        if (t == null) {
+                                continue;
+                        }
+                        if (to.getClass() != f.getClass()) {
+                                continue;
+                        }
+                        to.set(t, from.get(f, Object.class));
+                        ++copied;
+                }
+                return copied;
+        }
 }