From 2f94e73d056076e6a5dc7ce190b156f7fb6d316c Mon Sep 17 00:00:00 2001 From: Marta Vaclavikova Date: Sun, 9 Dec 2007 23:54:34 +0000 Subject: [PATCH] parsing errors --- .../src/cz/zcu/fav/kiv/editor/config/ParameterParser.java | 4 ++-- .../src/cz/zcu/fav/kiv/editor/config/PropertyParser.java | 2 +- .../fav/kiv/editor/config/handlers/PropertyXmlHandler.java | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) 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 8eebaa65d..c4e1269f4 100644 --- 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); else unparsedParameterList.put(element.getName(), element); + ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml")); } - ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml")); - } catch (IOException ex) { + } catch (IOException ex) { MessageWriter.writeWarning(ResourceController.getMessage( "parser.xml_definition_file.missing_file", element.getName(), OptionItems.XML_DEFINITION_PATH)); 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 97b1a72c5..7c3d8ff0b 100644 --- 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"); if (handler.isValid()) { parsedPropertyList.put(element.getName(), element); + ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml")); } //unparsed attributes if (handler.getUnparsedAttributeList().size() > 0) unparsedAttributeList.putAll(handler.getUnparsedAttributeList()); - ProgressControl.addStatMessage(ResourceController.getMessage("frame.intro.progress.read_file", OptionItems.XML_DEFINITION_PATH + File.separator + element.getName()+".xml")); } catch (IOException ex) { MessageWriter.writeWarning(ResourceController.getMessage( "parser.xml_definition_file.missing_file", element.getName(), 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 39e76e0ee..082f97965 100644 --- 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); break; case REFMISCINFO: + if (atts.getType(ParameterTags.OTHERCLASS) == null) { + MessageWriter.writeWarning(ResourceController.getMessage( + "parser.property.invalid_type", FileConst.CONF_FILE_CONFIG, property + .getName(), property.getLineNumber())); + valid = false; + return; + } if (atts.getType(ParameterTags.OTHERCLASS).equals(ParameterTags.DATATYPE.toString())) { insideRefmiscinfoDatatype = true; refmiscinfoDatatypeBuffer.setLength(0); -- 2.40.0