Changeset 87 for java/main/src/main/java/com/framsticks/params/FramsClass.java

Timestamp:

06/28/13 11:56:03 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• FramsClass? and contained Param are now immutable classes (like String),

which allows to refer to them concurrently without synchronization
(which for example in turn simplifies GUI management)

• also make Path immutable (which was earlier only assumed)
• add global cache for FramsClasses? created solely and automatically

on base of Java classes.

• add global cache for ReflectionAccess?.Backend precomputed proxy

representations basing on given FramsClass?

• above changes greatly improved GUI responsivness during browsing
• furtherly improve Param class hierarchy
• allow to inject actions on state changes into MultiParamLoader?
• add more tests

CHANGELOG:

Add StatusListener? to MultiParamLoader?.

Minor refactorization in MultiParamLoader?.

First step with auto append.

Add SchemaTest?.

Improve Registry.

Clean up in Registry.

Work out Registry.

Use annotations for Param.

Fix ListChange?.

Improve fluent interface of the FramsClassBuilder?.

Done caching of ReflectionAccess?.Backend

Fix hashCode of Pair.

A step on a way to cache ReflectionAccess?.Backend

Make SimpleAbstractAccess?.framsClass a final field.

Add static cache for FramsClasses? based on java.

Only classes created strictly and automatically
based on java classes are using this cache.

Make all Params immutable.

Many improvement to make Param immutable.

Make PrimitiveParam? generic type.

Several changes to make Param immutable.

Make FramsClass? immutable.

Another improvement to Path immutability.

Several improvements to Path.

Improve PathTest?.

Configurarable MutabilityDetector?.

File:

• java/main/src/main/java/com/framsticks/params/FramsClass.java (modified) (5 diffs)

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

@@ -8 +8 @@
 
 import javax.annotation.Nonnull;
+import javax.annotation.concurrent.Immutable;
+
+import org.apache.log4j.Logger;
 
 /**
@@ -21 +24 @@
  * @author Piotr Sniegowski
  */
+@Immutable
 @FramsClassAnnotation(id = "class", name = "class")
 public final class FramsClass {
 
-        /** The offset of the parameter (applied for newly added parameter). */
-        protected int fieldsNumber;
+        private final static Logger log = Logger.getLogger(FramsClass.class);
 
-        /** The groups. */
-        protected List<Group> groups = new ArrayList<Group>();
+        protected final String id;
+
+        protected final String name;
+
+        protected final String description;
+
+        protected final List<Group> groups;
+
+        /** The param list (for accessing parameters by offset in O(1) time. */
+        protected final List<Param> paramList;
 
         /**
@@ -36 +47 @@
         protected Map<String, Param> paramEntryMap = new LinkedHashMap<String, Param>();
 
-        /** The param list (for accessing parameters by offset in O(1) time. */
-        protected List<Param> paramList = new ArrayList<Param>();
-
-        /** The param getId map (for fast lookup of offset based on name */
-        protected Map<String, Integer> paramIdMap = new HashMap<String, Integer>();
-
-        protected String id;
-
-        protected String name;
-
-        protected String description;
+        // /** The param getId map (for fast lookup of offset based on name */
+        // protected Map<String, Integer> paramIdMap = new HashMap<String, Integer>();
 
         public Collection<Param> getParamEntries() {
@@ -52 +54 @@
         }
 
-        public FramsClass() {
+        public FramsClass(String id, String name, String description, List<Param> params, List<Group> groups) {
 
-        }
+                this.id = id;
+                this.name = name;
+                this.description = description;
+                this.groups = groups;
+                this.paramList = params;
 
-        public FramsClass(String id, String name, String description) {
-                this.setId(id);
-                this.setName(name);
-                this.setDescription(description);
-        }
+                for (Param param : params) {
+                        paramEntryMap.put(param.getId(), param);
+                        try {
+                                Group group = groups.get(param.getGroup());
+                                if (group != null) {
+                                        group.addProperty(param);
+                                }
+                        } catch (IndexOutOfBoundsException ignored) {
 
-        /**
-         * Adds new param entry.
-         *
-         * @param param
-         *            the new param entry
-         */
-        public FramsClass append(Param param) {
-                // if (param.hasFlag(Flags.USERHIDDEN)) {
-                //      return this;
-                // }
-                paramEntryMap.put(param.getId(), param);
-                //paramEntryMap.put(param.getInternalId(), param);
-                paramList.add(param);
-                try {
-                        Group group = groups.get(param.getGroup());
-                        if (group != null) {
-                                group.addProperty(param);
                         }
-                } catch (IndexOutOfBoundsException ignored) {
-
                 }
 
-                return this;
-        }
+                log.trace("created framsclass " + this);
 
-        public FramsClass append(ParamBuilder builder) {
-                return append(builder.finish());
-        }
-
-        /**
-         * Adds new group.
-         */
-        public FramsClass appendGroup(Group group) {
-                groups.add(group);
-                return this;
         }
 
@@ -206 +185 @@
         @Override
         public String toString() {
-                return id;
+                return id + "(" + name + ")";
         }
 
-        @ParamAnnotation
-        public void setId(String id) {
-                this.id = id;
-        }
-
-        @ParamAnnotation
-        public void setName(String name) {
-                this.name = name;
-        }
-
-        @ParamAnnotation(id = "desc")
-        public void setDescription(String description) {
-                this.description = description;
+        public static FramsClassBuilder build() {
+                return new FramsClassBuilder();
         }
 }