Author: cbegin Date: Sun Jun 10 15:37:21 2007 New Revision: 545958 URL: http://svn.apache.org/viewvc?view=rev&rev=545958 Log: Removed remaining saveXconfig methods
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?view=diff&rev=545958&r1=545957&r2=545958 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java Sun Jun 10 15:37:21 2007 @@ -206,7 +206,8 @@ private void addResultMapNodelets() { parser.addNodelet("/sqlMap/resultMap/end()", new Nodelet() { public void process(Node node) throws Exception { - state.getResultConfig().saveResultMap(); + state.getConfig().getErrorContext().setMoreInfo(null); + state.getConfig().getErrorContext().setObjectId(null); } }); parser.addNodelet("/sqlMap/resultMap", new Nodelet() { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java?view=diff&rev=545958&r1=545957&r2=545958 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java Sun Jun 10 15:37:21 2007 @@ -53,8 +53,6 @@ MappedStatementConfig statementConf = state.getConfig().newMappedStatementConfig(id, statement, new XMLSqlSource(state, node), parameterMapName, parameterClassName, resultMapName, additionalResultMapNames, resultClassName, additionalResultClasses, resultSetType, fetchSize, allowRemapping, timeout, cacheModelName, xmlResultName); findAndParseSelectKey(node, statementConf); - - statementConf.saveMappedStatement(); } private void findAndParseSelectKey(Node node, MappedStatementConfig config) { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java?view=diff&rev=545958&r1=545957&r2=545958 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java Sun Jun 10 15:37:21 2007 @@ -117,6 +117,7 @@ mappedStatement = statement; } rootStatement = statement; + delegate.addMappedStatement(mappedStatement); } public void setSelectKeyStatement(SqlSource processor, String resultClassName, String keyPropName, boolean runAfterSQL, String type) { @@ -169,10 +170,6 @@ } else { throw new SqlMapException("You cant set a select key statement on statement named " + rootStatement.getId() + " because it is not an InsertStatement."); } - } - - public void saveMappedStatement() { - delegate.addMappedStatement(mappedStatement); } private void setSqlForStatement(GeneralStatement statement, Sql sql) { Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java?view=diff&rev=545958&r1=545957&r2=545958 ============================================================================== --- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java (original) +++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java Sun Jun 10 15:37:21 2007 @@ -73,6 +73,8 @@ } errorContext.setMoreInfo("Check the result mappings."); resultMappingIndex = resultMappingList.size(); + resultMap.setResultMappingList(resultMappingList); + client.getDelegate().addResultMap(resultMap); } public void setDiscriminator(String columnName, String columnIndex, String javaType, String jdbcType, String nullValue, String callback) { @@ -121,13 +123,14 @@ mapping.setColumnIndex(Integer.parseInt(columnIndex)); } discriminator = new Discriminator(delegate, mapping); + resultMap.setDiscriminator(discriminator); } - public void addDiscriminatorSubMap(String value, String resultMap) { + public void addDiscriminatorSubMap(Object value, String resultMap) { if (discriminator == null) { throw new RuntimeException("The discriminator is null, but somehow a subMap was reached. This is a bug."); } - discriminator.addSubMap(value, resultMap); + discriminator.addSubMap(value.toString(), resultMap); } public void addResultMapping(String propertyName, String columnName, String columnIndex, String javaType, String jdbcType, String nullValue, String statementName, String resultMapName, String callback) { @@ -186,18 +189,7 @@ mapping.setColumnIndex(resultMappingIndex); } resultMappingList.add(mapping); - } - - public void saveResultMap() { - if (resultMappingList.size() == 0) { - throw new RuntimeException("resultMap " + resultMap.getId() + " must have at least one result mapping"); - } resultMap.setResultMappingList(resultMappingList); - resultMap.setDiscriminator(discriminator); - discriminator = null; - client.getDelegate().addResultMap(resultMap); - errorContext.setMoreInfo(null); - errorContext.setObjectId(null); } }