Changeset 85 for java/main/src/main/java/com/framsticks/parsers/Schema.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/parsers/Schema.java (modified) (9 diffs)

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

@@ -26 +26 @@
  * classes definitions that can be used in f0 representation). Definitions are
  * loaded from XML stream.
- * 
+ *
  * @author Jarek Szymczak <name.surname@gmail.com>
  * (please replace name and surname with my personal data)
@@ -46 +46 @@
         /**
          * Instantiates a new schema.
-         * 
+         *
          * @param inputStream
          *            the xml stream with schema
@@ -104 +104 @@
                         }
 
-                } catch (IOException e) {
-                        logger.fatal("unexpected exception occurred: ", e);
-                        throw e;
-                } catch (ParserConfigurationException e) {
-                        logger.fatal("unexpected exception occurred: ", e);
-                        throw e;
-                } catch (SAXException e) {
+                } catch (IOException | ParserConfigurationException | SAXException e) {
                         logger.fatal("unexpected exception occurred: ", e);
                         throw e;
@@ -121 +115 @@
          * node under certain attribute getName. If value is not present or is other
          * getType than integer 0 is returned.
-         * 
+         *
          * @return attribute value if value exists and it's integer (0 otherwise)
-         * 
+         *
          */
         private static int getIntAttribute(NamedNodeMap attributes, String name) {
@@ -152 +146 @@
          * Method used for convenience, it retrieves the value stored in node under
          * certain attribute getName. If value is not present method returns null.
-         * 
+         *
          * @param attributeName
          *            the attribute getName
@@ -158 +152 @@
          *            the node
          * @return attribute value if value exists (null otherwise)
-         * 
+         *
          */
         private static String getAttributeFromNode(String attributeName, Node node) {
@@ -169 +163 @@
         /**
          * In this method analysis of single class is performed.
-         * 
+         *
          * @param classNode
          *            the class node
@@ -228 +222 @@
         /**
          * It analyses the single property within the class
-         * 
+         *
          * @param attributes
          *            the attributes of property
@@ -267 +261 @@
                 }
 
-                ParamBuilder builder = new ParamBuilder();
-                builder.setId(id).setName(name).setHelp(description).setGroup(group).setFlags(flags);
-
-                builder.setType(type);
+                ParamBuilder builder = Param.build();
+                builder.id(id).name(name).help(description).group(group).flags(flags);
+
+                builder.type(type);
 
                 if ("d".equals(type)) {
-                        builder.setMin(extractAttribute(attributes, "MIN", Integer.class));
-                        builder.setMax(extractAttribute(attributes, "MAX", Integer.class));
-                        builder.setDef(extractAttribute(attributes, "DEF", Integer.class));
+                        builder.min(extractAttribute(attributes, "MIN", Integer.class));
+                        builder.max(extractAttribute(attributes, "MAX", Integer.class));
+                        builder.def(extractAttribute(attributes, "DEF", Integer.class));
                 } else if ("f".equals(type)) {
-                        builder.setMin(extractAttribute(attributes, "MIN", Double.class));
-                        builder.setMax(extractAttribute(attributes, "MAX", Double.class));
-                        builder.setDef(extractAttribute(attributes, "DEF", Double.class));
+                        builder.min(extractAttribute(attributes, "MIN", Double.class));
+                        builder.max(extractAttribute(attributes, "MAX", Double.class));
+                        builder.def(extractAttribute(attributes, "DEF", Double.class));
                 } else if ("s".equals(type)) {
-                        builder.setMin(extractAttribute(attributes, "MIN", Integer.class));
-                        builder.setMax(extractAttribute(attributes, "MAX", Integer.class));
-                        builder.setDef(extractAttribute(attributes, "DEF", Integer.class));
-                        builder.setDef(getAttribute(attributes, "DEF"));
+                        builder.min(extractAttribute(attributes, "MIN", Integer.class));
+                        builder.max(extractAttribute(attributes, "MAX", Integer.class));
+                        builder.def(extractAttribute(attributes, "DEF", Integer.class));
+                        builder.def(getAttribute(attributes, "DEF"));
                 } else {
-                        builder.setType(type);
-                }
-                return builder.build();
+                        builder.type(type);
+                }
+                return builder.finish();
         }