[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/configuration XmlConfigurator.java, 1.3, 1.4
Brought to you by:
davideconsonni
Menu
▾
▴
[Csvtosql-cvs] csvtosql_jdk50/src/net/sf/csv2sql/configuration XmlConfigurator.java, 1.3, 1.4
|
From: consonni d. <dav...@us...> - 2007-12-10 22:57:51
|
Update of /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18614 Modified Files: XmlConfigurator.java Log Message: no message Index: XmlConfigurator.java =================================================================== RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration/XmlConfigurator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XmlConfigurator.java 11 Oct 2006 18:23:17 -0000 1.3 --- XmlConfigurator.java 10 Dec 2007 22:57:43 -0000 1.4 *************** *** 1,15 **** /* Copyright (C) 2006 Davide Consonni <dav...@us...> - This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software --- 1,12 ---- *************** *** 38,44 **** */ public class XmlConfigurator implements Configurator { ! private Document document; - private List<AbstractWriter> writers; private AbstractRender renderer; --- 35,40 ---- */ public class XmlConfigurator implements Configurator { ! private Document document; private List<AbstractWriter> writers; private AbstractRender renderer; *************** *** 47,57 **** private Storage storage; private File configurationFile; ! public String getConfigurationDirectory() { return configurationFile.getParent(); } ! public void load(File configurationFile) ! throws ConfiguratorException { this.configurationFile = configurationFile; try { --- 43,53 ---- private Storage storage; private File configurationFile; ! public String getConfigurationDirectory() { return configurationFile.getParent(); } ! public void load(File configurationFile) ! throws ConfiguratorException { this.configurationFile = configurationFile; try { *************** *** 64,104 **** } } ! public TableStructure getTableStructure() ! throws ConfiguratorException { try { ! if (structure!=null) {return structure;} ! Node structureNode = document.getElementsByTagName("structure").item(0); ! structure = new TableStructure(structureNode.getAttributes().getNamedItem("tablename").getNodeValue()); AbstractGrammarFactory grammarFactory = this.getGrammar(); ! //read the fields NodeList list = structureNode.getChildNodes(); ! for (int i = 0; i<list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { //read parameter of childs Properties p = new Properties(); NodeList parameters = list.item(i).getChildNodes(); ! for (int j = 0; j<parameters.getLength(); j++) { if (parameters.item(j).getNodeType() == Node.ELEMENT_NODE) { p.setProperty( parameters.item(j).getAttributes().getNamedItem("name").getNodeValue(), ! parameters.item(j).getAttributes().getNamedItem("value").getNodeValue() ! ); } } ! //add field structure.addField(grammarFactory.createField( list.item(i).getAttributes().getNamedItem("type").getNodeValue(), list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! p ! )); ! } } ! return structure; } catch (Exception e) { --- 60,100 ---- } } ! public TableStructure getTableStructure() ! throws ConfiguratorException { try { ! if (structure != null) { ! return structure; ! } ! Node structureNode = document.getElementsByTagName("structure").item(0); ! structure = new TableStructure(structureNode.getAttributes().getNamedItem("tablename").getNodeValue()); AbstractGrammarFactory grammarFactory = this.getGrammar(); ! //read the fields NodeList list = structureNode.getChildNodes(); ! for (int i = 0; i < list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { //read parameter of childs Properties p = new Properties(); NodeList parameters = list.item(i).getChildNodes(); ! for (int j = 0; j < parameters.getLength(); j++) { if (parameters.item(j).getNodeType() == Node.ELEMENT_NODE) { p.setProperty( parameters.item(j).getAttributes().getNamedItem("name").getNodeValue(), ! parameters.item(j).getAttributes().getNamedItem("value").getNodeValue()); } } ! //add field structure.addField(grammarFactory.createField( list.item(i).getAttributes().getNamedItem("type").getNodeValue(), list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! p)); ! } } ! return structure; } catch (Exception e) { *************** *** 107,113 **** } } ! public int getDescriptorVersion() ! throws ConfiguratorException { try { Node descriptorNode = document.getElementsByTagName("descriptor").item(0); --- 103,109 ---- } } ! public int getDescriptorVersion() ! throws ConfiguratorException { try { Node descriptorNode = document.getElementsByTagName("descriptor").item(0); *************** *** 117,124 **** } } ! /** grammars */ private String getGrammarClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("grammar").item(0). --- 113,120 ---- } } ! /** grammars */ private String getGrammarClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("grammar").item(0). *************** *** 128,141 **** } } ! public AbstractGrammarFactory getGrammar() ! throws ConfiguratorException { try { ! ! if (abstractGrammarFactory!=null) {return abstractGrammarFactory;} ! //instantiating grammar ! abstractGrammarFactory = (AbstractGrammarFactory)Class.forName(getGrammarClassName()).newInstance(); ! return abstractGrammarFactory; } catch (Exception e) { --- 124,139 ---- } } ! public AbstractGrammarFactory getGrammar() ! throws ConfiguratorException { try { ! ! if (abstractGrammarFactory != null) { ! return abstractGrammarFactory; ! } ! //instantiating grammar ! abstractGrammarFactory = (AbstractGrammarFactory) Class.forName(getGrammarClassName()).newInstance(); ! return abstractGrammarFactory; } catch (Exception e) { *************** *** 143,150 **** } } ! /** renderers */ private String getRenderClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("render").item(0). --- 141,148 ---- } } ! /** renderers */ private String getRenderClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("render").item(0). *************** *** 154,182 **** } } ! public AbstractRender getRender() ! throws ConfiguratorException { try { ! if (renderer!=null) {return renderer;} ! //instantiating the renderer ! renderer = (AbstractRender)Class.forName(getRenderClassName()).newInstance(); ! //setting render properties Properties renderProps = new Properties(); Node renderNode = document.getElementsByTagName("render").item(0); NodeList list = renderNode.getChildNodes(); ! for (int i = 0; i<list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { renderProps.setProperty( list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(i).getAttributes().getNamedItem("value").getNodeValue() ! ); } } ! renderProps.setProperty("configdirectory", getConfigurationDirectory()+System.getProperty("file.separator")); ! renderer.configure(renderProps, this.getTableStructure(), getStorage()); ! return renderer; } catch (Exception e) { --- 152,181 ---- } } ! public AbstractRender getRender() ! throws ConfiguratorException { try { ! if (renderer != null) { ! return renderer; ! } ! //instantiating the renderer ! renderer = (AbstractRender) Class.forName(getRenderClassName()).newInstance(); ! //setting render properties Properties renderProps = new Properties(); Node renderNode = document.getElementsByTagName("render").item(0); NodeList list = renderNode.getChildNodes(); ! for (int i = 0; i < list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { renderProps.setProperty( list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(i).getAttributes().getNamedItem("value").getNodeValue()); } } ! renderProps.setProperty("configdirectory", getConfigurationDirectory() + System.getProperty("file.separator")); ! renderer.configure(renderProps, this.getTableStructure(), getStorage()); ! return renderer; } catch (Exception e) { *************** *** 185,236 **** } } ! public List<AbstractWriter> getWriters() ! throws ConfiguratorException { try { ! if (writers!=null) {return writers;} ! writers = new ArrayList<AbstractWriter>(); NodeList writerAppenders = document.getElementsByTagName("writerAppender"); ! //all appenders ! for(int i=0; i<writerAppenders.getLength() ; i++){ Node writerAppenderNode = writerAppenders.item(i); ! if(writerAppenderNode.getNodeType() == Node.ELEMENT_NODE){ ! //the writer must be activated if ("true".equals(writerAppenderNode.getAttributes().getNamedItem("active").getNodeValue())) { String writerAppenderClassName = writerAppenderNode.getAttributes().getNamedItem("class").getNodeValue(); ! AbstractWriter writer = (AbstractWriter)Class.forName(writerAppenderClassName).newInstance(); ! //setting render properties Properties writerProps = new Properties(); NodeList list = writerAppenderNode.getChildNodes(); ! for (int j = 0; j<list.getLength(); j++) { if (list.item(j).getNodeType() == Node.ELEMENT_NODE) { writerProps.setProperty( list.item(j).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(j).getAttributes().getNamedItem("value").getNodeValue() ! ); } } writer.configure(writerProps, getStorage()); ! //finally add it writers.add(writer); } ! } } ! return writers; ! } catch (Exception e) {e.printStackTrace(); ! throw new ConfiguratorException(e.getMessage()); } } ! /** storage */ private String getStorageClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("storage").item(0). --- 184,237 ---- } } ! public List<AbstractWriter> getWriters() ! throws ConfiguratorException { try { ! if (writers != null) { ! return writers; ! } ! writers = new ArrayList<AbstractWriter>(); NodeList writerAppenders = document.getElementsByTagName("writerAppender"); ! //all appenders ! for (int i = 0; i < writerAppenders.getLength(); i++) { Node writerAppenderNode = writerAppenders.item(i); ! if (writerAppenderNode.getNodeType() == Node.ELEMENT_NODE) { ! //the writer must be activated if ("true".equals(writerAppenderNode.getAttributes().getNamedItem("active").getNodeValue())) { String writerAppenderClassName = writerAppenderNode.getAttributes().getNamedItem("class").getNodeValue(); ! AbstractWriter writer = (AbstractWriter) Class.forName(writerAppenderClassName).newInstance(); ! //setting render properties Properties writerProps = new Properties(); NodeList list = writerAppenderNode.getChildNodes(); ! for (int j = 0; j < list.getLength(); j++) { if (list.item(j).getNodeType() == Node.ELEMENT_NODE) { writerProps.setProperty( list.item(j).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(j).getAttributes().getNamedItem("value").getNodeValue()); } } writer.configure(writerProps, getStorage()); ! //finally add it writers.add(writer); } ! } } ! return writers; ! } catch (Exception e) { ! e.printStackTrace(); ! throw new ConfiguratorException(e.getMessage()); } } ! /** storage */ private String getStorageClassName() ! throws ConfiguratorException { try { return document.getElementsByTagName("storage").item(0). *************** *** 240,269 **** } } ! public Storage getStorage() ! throws ConfiguratorException { try { ! ! if (storage!=null) {return storage;} ! //instantiating the renderer ! storage = (Storage)Class.forName(getStorageClassName()).newInstance(); ! //setting render properties Properties props = new Properties(); Node node = document.getElementsByTagName("storage").item(0); NodeList list = node.getChildNodes(); ! for (int i = 0; i<list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { props.setProperty( list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(i).getAttributes().getNamedItem("value").getNodeValue() ! ); } } ! props.setProperty("configdirectory", getConfigurationDirectory()+System.getProperty("file.separator")); ! storage.configure(props); ! return storage; } catch (Exception e) { --- 241,271 ---- } } ! public Storage getStorage() ! throws ConfiguratorException { try { ! ! if (storage != null) { ! return storage; ! } ! //instantiating the renderer ! storage = (Storage) Class.forName(getStorageClassName()).newInstance(); ! //setting render properties Properties props = new Properties(); Node node = document.getElementsByTagName("storage").item(0); NodeList list = node.getChildNodes(); ! for (int i = 0; i < list.getLength(); i++) { if (list.item(i).getNodeType() == Node.ELEMENT_NODE) { props.setProperty( list.item(i).getAttributes().getNamedItem("name").getNodeValue(), ! list.item(i).getAttributes().getNamedItem("value").getNodeValue()); } } ! props.setProperty("configdirectory", getConfigurationDirectory() + System.getProperty("file.separator")); ! storage.configure(props); ! return storage; } catch (Exception e) { *************** *** 272,275 **** } } - } --- 274,276 ---- |
