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

Timestamp:

06/24/13 13:38:40 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• upgrade to Java 7
  • use try-multi-catch clauses
  • use try-with-resources were appropriate
• configure FindBugs? (use mvn site and then navigate in browser to the report)
  • remove most bugs found
• parametrize Dispatching environment (Dispatcher, RunAt?) to enforce more control on the place of closures actual call

CHANGELOG:
Rework FavouritesXMLFactory.

FindBugs?. Thread start.

FindBugs?. Minor change.

FindBugs?. Iterate over entrySet.

FindBugs?. Various.

FindBug?.

FindBug?. Encoding.

FindBug?. Final fields.

FindBug?.

Remove synchronization bug in ClientConnection?.

Experiments with findbugs.

Finish parametrization.

Make RunAt? an abstract class.

More changes in parametrization.

More changes in parametrizing dispatching.

Several changes to parametrize tasks.

Rename Runnable to RunAt?.

Add specific framsticks Runnable.

Add JSR305 (annotations).

Add findbugs reporting.

More improvements to ParamBuilder? wording.

Make FramsClass? accept also ParamBuilder?.

Change wording of ParamBuilder?.

Change wording of Request creation.

Use Java 7 exception catch syntax.

Add ScopeEnd? class.

Upgrade to Java 7.

File:

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

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

@@ -26 +26 @@
 public final class FramsClass {
 
-        private final static Logger log = Logger.getLogger(FramsClass.class.getName());
-
-        /**
-          * The Class which represents group.
-          */
+        private final static Logger log = Logger.getLogger(FramsClass.class
+                        .getName());
+
+        /**
+         * The Class which represents group.
+         */
 
         /** The offset of the parameter (applied for newly added parameter). */
@@ -91 +92 @@
         }
 
+        public FramsClass append(ParamBuilder builder) {
+                return append(builder.finish());
+        }
+
         /**
          * Adds new group.
@@ -185 +190 @@
         public static FramsClass getFramsClass() {
                 return new FramsClass("class", "class", null)
-                        .append(new ParamBuilder().setId("name").setName("Name").setType(StringParam.class).build())
-                        .append(new ParamBuilder().setId("id").setName("id").setType(StringParam.class).build())
-                        .append(new ParamBuilder().setId("desc").setName("Description").setType(StringParam.class).build());
+                        .append(Param.build().id("name").name("Name").type(StringParam.class))
+                        .append(Param.build().id("id").name("id").type(StringParam.class))
+                        .append(Param.build().id("desc").name("Description").type(StringParam.class));
         }
 
@@ -210 +215 @@
                                 //TODO uid should be passed along during construction
                                 if (containedType instanceof Class) {
-                                        return "l " + ((Class<?>) containedType).getCanonicalName() + " name";
+                                        return "l " + ((Class<?>) containedType).getCanonicalName()
+                                                        + " name";
                                 }
                         }
@@ -248 +254 @@
 
                 public Constructor(Class<?> src, String name) {
-                        result = new FramsClass(name, name, GENERATE_HELP_PREFIX + src.toString());
+                        result = new FramsClass(name, name, GENERATE_HELP_PREFIX
+                                        + src.toString());
                         currentClass = src;
                         while (currentClass != null) {
                                 try {
                                         currentClass.getMethod("constructFramsClass", Constructor.class).invoke(null, this);
-                                } catch (Exception ignored) {
+                                } catch (IllegalAccessException | IllegalArgumentException
+                                                | InvocationTargetException | NoSuchMethodException
+                                                | SecurityException e) {
+                                        log.debug("failed to use constructFramsClass static method (skipping): ", e);
                                 }
                                 currentClass = currentClass.getSuperclass();
@@ -285 +295 @@
                                         if (method.getName().startsWith("get")) {
                                                 String fieldName = method.getName().substring(3, 4).toLowerCase() + method.getName().substring(4);
-                                                Param param = new ParamBuilder().setType(returnParamClass).setName(fieldName).setId(fieldName).setHelp(GENERATE_HELP_PREFIX + method.toString()).build();
+                                                Param param = Param.build().type(returnParamClass).name(fieldName).id(fieldName).help(GENERATE_HELP_PREFIX + method.toString()).finish();
                                                 assert param != null;
                                                 result.append(param);
@@ -308 +318 @@
                                         return this;
                                 }
-                                Param param = new ParamBuilder().setType(paramClass).setName(field.getName()).setId(field.getName()).setHelp(GENERATE_HELP_PREFIX + field.toString()).build();
+                                Param param = Param.build().type(paramClass).name(field.getName()).id(field.getName()).help(GENERATE_HELP_PREFIX + field.toString()).finish();
                                 assert param != null;
                                 result.append(param);