parsing errors

diff --git a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/ParameterParser.java b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/ParameterParser.java
index 8eebaa65d2222b1091a424912de28b4b542225f7..c4e1269f473e75e947138c0a513f934d170bf6af 100644 (file)
--- a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/ParameterParser.java
+++ b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/ParameterParser.java
@@ -112,9 +112,9 @@ public class ParameterParser {
                     parsedParameterList.put(element.getName(), element);\r
                 else\r
                     unparsedParameterList.put(element.getName(), element);\r
+                ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml"));                   \r
             }\r
-            ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml"));                   \r
-        } catch (IOException ex) {\r
+         } catch (IOException ex) {\r
             MessageWriter.writeWarning(ResourceController.getMessage(\r
                     "parser.xml_definition_file.missing_file", element.getName(),\r
                     OptionItems.XML_DEFINITION_PATH));\r

diff --git a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/PropertyParser.java b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/PropertyParser.java
index 97b1a72c537b30da5be6feb316faba223392db4b..7c3d8ff0ba758fa1dfc2cbda2bb0f1279c84edf6 100644 (file)
--- a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/PropertyParser.java
+++ b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/PropertyParser.java
@@ -87,11 +87,11 @@ public class PropertyParser {
                     + ".xml");\r
             if (handler.isValid()) {\r
                 parsedPropertyList.put(element.getName(), element);\r
+                ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml"));\r
             }\r
             //unparsed attributes\r
             if (handler.getUnparsedAttributeList().size() > 0)\r
                 unparsedAttributeList.putAll(handler.getUnparsedAttributeList());\r
-            ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml"));\r
         } catch (IOException ex) {\r
             MessageWriter.writeWarning(ResourceController.getMessage(\r
                     "parser.xml_definition_file.missing_file", element.getName(),\r

diff --git a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/handlers/PropertyXmlHandler.java b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/handlers/PropertyXmlHandler.java
index 39e76e0eed8f063a7685b569f7fef344d67207f3..082f9796546b4431d3e6b0017ebae2dfcdf32660 100644 (file)
--- a/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/handlers/PropertyXmlHandler.java
+++ b/contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/config/handlers/PropertyXmlHandler.java
@@ -93,6 +93,13 @@ public class PropertyXmlHandler extends DefaultHandler {
             purposeBuffer.setLength(0);\r
             break;\r
         case REFMISCINFO:\r
+               if (atts.getType(ParameterTags.OTHERCLASS) == null) {\r
+                MessageWriter.writeWarning(ResourceController.getMessage(\r
+                        "parser.property.invalid_type", FileConst.CONF_FILE_CONFIG, property\r
+                                .getName(), property.getLineNumber()));\r
+                valid = false;\r
+                return;\r
+               }\r
             if (atts.getType(ParameterTags.OTHERCLASS).equals(ParameterTags.DATATYPE.toString())) {\r
                 insideRefmiscinfoDatatype = true;\r
                 refmiscinfoDatatypeBuffer.setLength(0);\r