You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2004/06/13 10:26:01 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/metadata JdbcConnectionDescriptor.java IndexDescriptor.java ClassDescriptor.java FieldDescriptor.java DeleteProcedureDescriptor.java ObjectCacheDescriptor.java InsertProcedureDescriptor.java UpdateProcedureDescriptor.java SequenceDescriptor.java ObjectReferenceDescriptor.java
brj 2004/06/13 01:26:01
Modified: src/java/org/apache/ojb/broker/metadata
JdbcConnectionDescriptor.java IndexDescriptor.java
ClassDescriptor.java FieldDescriptor.java
DeleteProcedureDescriptor.java
ObjectCacheDescriptor.java
InsertProcedureDescriptor.java
UpdateProcedureDescriptor.java
SequenceDescriptor.java
ObjectReferenceDescriptor.java
Log:
replaced string concatenation with StringBuffer (by robert sfeir)
Revision Changes Path
1.31 +79 -35 db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java
Index: JdbcConnectionDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JdbcConnectionDescriptor.java 4 Apr 2004 23:53:34 -0000 1.30
+++ JdbcConnectionDescriptor.java 13 Jun 2004 08:26:00 -0000 1.31
@@ -19,10 +19,6 @@
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
-import org.apache.ojb.broker.metadata.SequenceDescriptor;
-import org.apache.ojb.broker.metadata.ConnectionPoolDescriptor;
-import org.apache.ojb.broker.metadata.XmlCapable;
-import org.apache.ojb.broker.metadata.RepositoryTags;
import org.apache.ojb.broker.PBKey;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -429,53 +425,101 @@
RepositoryTags tags = RepositoryTags.getInstance();
String eol = SystemUtils.LINE_SEPARATOR;
- String strReturn = eol + " <!-- Descriptor for Connection " + getProtocol() + ":" + getSubProtocol() + ":" + getDbAlias() + " -->" + eol;
-
- strReturn += " " + tags.getOpeningTagNonClosingById(JDBC_CONNECTION_DESCRIPTOR) + eol;
- strReturn += " " + tags.getAttribute(JCD_ALIAS, this.getJcdAlias()) + eol;
- strReturn += " " + tags.getAttribute(DEFAULT_CONNECTION, ""+this.isDefaultConnection()) + eol;
- strReturn += " " + tags.getAttribute(DBMS_NAME, this.getDbms()) + eol;
- strReturn += " " + tags.getAttribute(JDBC_LEVEL, "" + this.getJdbcLevel()) + eol;
+ StringBuffer strReturn = new StringBuffer( 1024 );
+ strReturn.append( eol );
+ strReturn.append( " <!-- Descriptor for Connection " );
+ strReturn.append( getProtocol() );
+ strReturn.append( ":" );
+ strReturn.append( getSubProtocol() );
+ strReturn.append( ":" );
+ strReturn.append( getDbAlias() );
+ strReturn.append( " -->" );
+ strReturn.append( eol );
+
+ strReturn.append( " " );
+ strReturn.append( tags.getOpeningTagNonClosingById( JDBC_CONNECTION_DESCRIPTOR ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( JCD_ALIAS, this.getJcdAlias() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( DEFAULT_CONNECTION, "" + this.isDefaultConnection() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( DBMS_NAME, this.getDbms() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( JDBC_LEVEL, "" + this.getJdbcLevel() ) );
+ strReturn.append( eol );
//username is optional
String user = getUserName();
- if (user != null)
+ if( user != null )
{
- strReturn += " " + tags.getAttribute(USER_NAME, user) + eol;
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( USER_NAME, user ) );
+ strReturn.append( eol );
}
// password is optional
String passwd = getPassWord();
- if (passwd != null)
+ if( passwd != null )
{
- strReturn += " " + tags.getAttribute(USER_PASSWD, passwd) + eol;
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( USER_PASSWD, passwd ) );
+ strReturn.append( eol );
}
// JDBC Datasource or DriverManager information are alternatives:
String dsn = getDatasourceName();
- if (dsn != null)
+ if( dsn != null )
{
- strReturn += " " + tags.getAttribute(DATASOURCE_NAME, this.getDatasourceName()) + eol;
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( DATASOURCE_NAME, this.getDatasourceName() ) );
+ strReturn.append( eol );
}
else
{
- strReturn += " " + tags.getAttribute(DRIVER_NAME, this.getDriver()) + eol;
- strReturn += " " + tags.getAttribute(URL_PROTOCOL,this.getProtocol()) + eol;
- strReturn += " " + tags.getAttribute(URL_SUBPROTOCOL, this.getSubProtocol()) + eol;
- strReturn += " " + encode(tags.getAttribute(URL_DBALIAS, this.getDbAlias())) + eol;
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( DRIVER_NAME, this.getDriver() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( URL_PROTOCOL, this.getProtocol() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( URL_SUBPROTOCOL, this.getSubProtocol() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( encode( tags.getAttribute( URL_DBALIAS, this.getDbAlias() ) ) );
+ strReturn.append( eol );
}
- strReturn += " " + tags.getAttribute(EAGER_RELEASE, "" + this.getEagerRelease()) + eol;
- strReturn += " " + tags.getAttribute(BATCH_MODE, "" + this.getBatchMode()) + eol;
- strReturn += " " + tags.getAttribute(USE_AUTOCOMMIT, "" + this.getUseAutoCommit()) + eol;
- strReturn += " " + tags.getAttribute(IGNORE_AUTOCOMMIT_EXCEPTION, "" +
- this.isIgnoreAutoCommitExceptions()) + eol;
-
- strReturn += " >" + eol+eol;
-
-
- strReturn += this.getConnectionPoolDescriptor().toXML()+eol;
- if(this.getSequenceDescriptor() != null) strReturn += this.getSequenceDescriptor().toXML()+eol;
- strReturn += " " + tags.getClosingTagById(JDBC_CONNECTION_DESCRIPTOR) + eol;
- return strReturn;
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( EAGER_RELEASE, "" + this.getEagerRelease() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( BATCH_MODE, "" + this.getBatchMode() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( USE_AUTOCOMMIT, "" + this.getUseAutoCommit() ) );
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getAttribute( IGNORE_AUTOCOMMIT_EXCEPTION, "" + this.isIgnoreAutoCommitExceptions() ) );
+ strReturn.append( eol );
+
+ strReturn.append( " >" );
+ strReturn.append( eol );
+ strReturn.append( eol );
+
+ strReturn.append( this.getConnectionPoolDescriptor().toXML() );
+ strReturn.append( eol );
+ if( this.getSequenceDescriptor() != null )
+ {
+ strReturn.append( this.getSequenceDescriptor().toXML() );
+ }
+ strReturn.append( eol );
+ strReturn.append( " " );
+ strReturn.append( tags.getClosingTagById( JDBC_CONNECTION_DESCRIPTOR ) );
+ strReturn.append( eol );
+ return strReturn.toString();
}
private static String encode(String toBeEncoded)
1.12 +24 -11 db-ojb/src/java/org/apache/ojb/broker/metadata/IndexDescriptor.java
Index: IndexDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/IndexDescriptor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IndexDescriptor.java 4 Apr 2004 23:53:34 -0000 1.11
+++ IndexDescriptor.java 13 Jun 2004 08:26:00 -0000 1.12
@@ -71,26 +71,39 @@
String eol = SystemUtils.LINE_SEPARATOR;
//opening tag + attributes
- String result = " <" + tags.getTagById(INDEX_DESCRIPTOR) + " ";
+ StringBuffer result = new StringBuffer( 1024 );
+ result.append( " <" );
+ result.append( tags.getTagById( INDEX_DESCRIPTOR ) );
+ result.append( " " );
// index name
- result += tags.getAttribute(NAME, getName()) + " ";
+ result.append( tags.getAttribute( NAME, getName() ) );
+ result.append( " " );
// unique attribute
- result += tags.getAttribute(UNIQUE, ""+isUnique()) + ">" + eol;
+ result.append( tags.getAttribute( UNIQUE, "" + isUnique() ) );
+ result.append( ">" );
+ result.append( eol );
// index columns
- for (int i = 0; i < indexColumns.size(); i++) {
- String l_name = (String) indexColumns.elementAt(i);
- result += " " + tags.getOpeningTagNonClosingById(INDEX_COLUMN) + " ";
- result += tags.getAttribute(NAME, l_name);
- result += " />" + eol;
+ for( int i = 0; i < indexColumns.size(); i++ )
+ {
+ String l_name = ( String ) indexColumns.elementAt( i );
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( INDEX_COLUMN ) );
+ result.append( " " );
+ result.append( tags.getAttribute( NAME, l_name ) );
+ result.append( " />" );
+ result.append( eol );
}
// closing tag
- result += " " + tags.getClosingTagById(INDEX_DESCRIPTOR) + " "+eol;
+ result.append( " " );
+ result.append( tags.getClosingTagById( INDEX_DESCRIPTOR ) );
+ result.append( " " );
+ result.append( eol );
- return result;
+ return result.toString();
}
}
1.86 +37 -37 db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
Index: ClassDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ClassDescriptor.java 6 May 2004 19:40:36 -0000 1.85
+++ ClassDescriptor.java 13 Jun 2004 08:26:00 -0000 1.86
@@ -1348,23 +1348,23 @@
String eol = System.getProperty("line.separator");
// comment on class
- String result =
- eol + " <!-- Mapping for Class " + this.getClassNameOfObject() + " -->" + eol;
+ StringBuffer result = new StringBuffer(1024);
+ result.append( eol + " <!-- Mapping for Class " + this.getClassNameOfObject() + " -->" + eol );
// opening tag and attributes
- result += " " + tags.getOpeningTagNonClosingById(CLASS_DESCRIPTOR) + eol;
+ result.append( " " + tags.getOpeningTagNonClosingById(CLASS_DESCRIPTOR) + eol );
// class
- result += " " + tags.getAttribute(CLASS_NAME, this.getClassNameOfObject()) + eol;
+ result.append( " " + tags.getAttribute(CLASS_NAME, this.getClassNameOfObject()) + eol );
// isolation level is optional
if (null != getRepository())
{
if (getIsolationLevel() != this.getRepository().getDefaultIsolationLevel())
{
- result += " "
+ result.append( " "
+ tags.getAttribute(ISOLATION_LEVEL, this.isolationLevelXml())
- + eol;
+ + eol );
}
}
@@ -1385,71 +1385,71 @@
{
if (ProxyHelper.isNormalOjbProxy(theProxyClass)) // tomdz: What about VirtualProxy ?
{
- result += " " + tags.getAttribute(CLASS_PROXY, "dynamic") + eol;
+ result.append( " " + tags.getAttribute(CLASS_PROXY, "dynamic") + eol );
}
else
{
- result += " " + tags.getAttribute(CLASS_PROXY, this.getProxyClassName()) + eol;
+ result.append( " " + tags.getAttribute(CLASS_PROXY, this.getProxyClassName()) + eol );
}
- result += " " + tags.getAttribute(PROXY_PREFETCHING_LIMIT, "" + this.getProxyPrefetchingLimit()) + eol;
+ result.append( " " + tags.getAttribute(PROXY_PREFETCHING_LIMIT, "" + this.getProxyPrefetchingLimit()) + eol );
}
// schema is optional
if (this.getSchema() != null)
{
- result += " " + tags.getAttribute(SCHEMA_NAME, this.getSchema()) + eol;
+ result.append( " " + tags.getAttribute(SCHEMA_NAME, this.getSchema()) + eol );
}
// table name
if (this.getTableName() != null)
{
- result += " " + tags.getAttribute(TABLE_NAME, this.getTableName()) + eol;
+ result.append(" " + tags.getAttribute(TABLE_NAME, this.getTableName()) + eol );
}
// rowreader is optional
if (this.getRowReaderClassName() != null)
{
- result += " " + tags.getAttribute(ROW_READER, this.getRowReaderClassName()) + eol;
+ result.append( " " + tags.getAttribute(ROW_READER, this.getRowReaderClassName()) + eol );
}
//accept-locks is optional, enabled by default
if (!this.acceptLocks)
{
- result += " " + tags.getAttribute(ACCEPT_LOCKS, "false") + eol;
+ result.append( " " + tags.getAttribute(ACCEPT_LOCKS, "false") + eol );
}
// sequence manager attribute not yet implemented
// initialization method is optional
if (this.getInitializationMethod() != null)
{
- result += " "
+ result.append( " "
+ tags.getAttribute(INITIALIZATION_METHOD, this.getInitializationMethod().getName())
- + eol;
+ + eol );
}
// factory class is optional
if (this.getFactoryClass() != null)
{
- result += " "
+ result.append( " "
+ tags.getAttribute(FACTORY_CLASS, this.getFactoryClass().getName())
- + eol;
+ + eol );
}
// factory method is optional
if (this.getFactoryMethod() != null)
{
- result += " "
+ result.append( " "
+ tags.getAttribute(FACTORY_METHOD, this.getFactoryMethod().getName())
- + eol;
+ + eol );
}
//reference refresh is optional, disabled by default
if (isAlwaysRefresh())
{
- result += " " + tags.getAttribute(REFRESH, "true") + eol;
+ result.append( " " + tags.getAttribute(REFRESH, "true") + eol );
}
- result += " >" + eol;
+ result.append( " >" + eol );
// end of attributes
@@ -1459,9 +1459,9 @@
// extent-class
for (int i = 0; i < getExtentClassNames().size(); i++)
{
- result += " " + tags.getOpeningTagNonClosingById(CLASS_EXTENT) + " ";
- result += tags.getAttribute(CLASS_REF, getExtentClassNames().get(i).toString());
- result += " />" + eol;
+ result.append( " " + tags.getOpeningTagNonClosingById(CLASS_EXTENT) + " " );
+ result.append( tags.getAttribute(CLASS_REF, getExtentClassNames().get(i).toString()) );
+ result.append( " />" + eol );
}
}
else
@@ -1471,9 +1471,9 @@
{
for (int i = 0; i < getExtentClassNames().size(); i++)
{
- result += " " + tags.getOpeningTagNonClosingById(CLASS_EXTENT) + " ";
- result += tags.getAttribute(CLASS_REF, getExtentClassNames().get(i).toString());
- result += " />" + eol;
+ result.append( " " + tags.getOpeningTagNonClosingById(CLASS_EXTENT) + " " );
+ result.append( tags.getAttribute(CLASS_REF, getExtentClassNames().get(i).toString()) );
+ result.append( " />" + eol );
}
}
@@ -1481,46 +1481,46 @@
FieldDescriptor[] fields = getFieldDescriptions();
for (int i = 0; i < fields.length; i++)
{
- result += fields[i].toXML();
+ result.append( fields[i].toXML() );
}
// write optional ReferenceDescriptors
Vector refs = getObjectReferenceDescriptors();
for (int i = 0; i < refs.size(); i++)
{
- result += ((ObjectReferenceDescriptor) refs.get(i)).toXML();
+ result.append( ((ObjectReferenceDescriptor) refs.get(i)).toXML() );
}
// write optional CollectionDescriptors
Vector cols = getCollectionDescriptors();
for (int i = 0; i < cols.size(); i++)
{
- result += ((CollectionDescriptor) cols.get(i)).toXML();
+ result.append( ((CollectionDescriptor) cols.get(i)).toXML() );
}
// write optional IndexDescriptors
for (int i = 0; i < indexes.size(); i++)
{
IndexDescriptor indexDescriptor = (IndexDescriptor) indexes.elementAt(i);
- result += indexDescriptor.toXML();
+ result.append( indexDescriptor.toXML() );
}
// Write out the procedures
if (this.getInsertProcedure() != null)
{
- result += this.getInsertProcedure().toXML();
+ result.append( this.getInsertProcedure().toXML() );
}
if (this.getUpdateProcedure() != null)
{
- result += this.getUpdateProcedure().toXML();
+ result.append( this.getUpdateProcedure().toXML() );
}
if (this.getDeleteProcedure() != null)
{
- result += this.getDeleteProcedure().toXML();
+ result.append( this.getDeleteProcedure().toXML() );
}
}
- result += " " + tags.getClosingTagById(CLASS_DESCRIPTOR);
- return result;
+ result.append( " " + tags.getClosingTagById(CLASS_DESCRIPTOR) );
+ return result.toString();
}
private String isolationLevelXml()
1.36 +62 -31 db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
Index: FieldDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- FieldDescriptor.java 4 Apr 2004 23:53:34 -0000 1.35
+++ FieldDescriptor.java 13 Jun 2004 08:26:00 -0000 1.36
@@ -438,87 +438,118 @@
String eol = SystemUtils.LINE_SEPARATOR;
//opening tag + attributes
- String result = " " + tags.getOpeningTagNonClosingById(FIELD_DESCRIPTOR) + " " + eol;
-
-// // id
-// String id = new Integer(getColNo()).toString();
-// result += /*" " +*/ tags.getAttribute(ID, id) + eol;
+ StringBuffer result = new StringBuffer( 1024 );
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( FIELD_DESCRIPTOR ) );
+ result.append( " " );
+ result.append( eol );
+
+ // // id
+ // String id = new Integer(getColNo()).toString();
+ // result += /*" " +*/ tags.getAttribute(ID, id) + eol;
// name
- result += " " + tags.getAttribute(FIELD_NAME, this.getAttributeName()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( FIELD_NAME, this.getAttributeName() ) );
+ result.append( eol );
// table not yet implemented
// column
- result += " " + tags.getAttribute(COLUMN_NAME, this.getColumnName()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( COLUMN_NAME, this.getColumnName() ) );
+ result.append( eol );
// jdbc-type
- result += " " + tags.getAttribute(JDBC_TYPE, this.getColumnType()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( JDBC_TYPE, this.getColumnType() ) );
+ result.append( eol );
// primarykey
- if (this.isPrimaryKey())
+ if( this.isPrimaryKey() )
{
- result += " " + tags.getAttribute(PRIMARY_KEY, "true") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( PRIMARY_KEY, "true" ) );
+ result.append( eol );
}
// nullable
- if (this.isRequired())
+ if( this.isRequired() )
{
- result += " " + tags.getAttribute(NULLABLE, "false") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( NULLABLE, "false" ) );
+ result.append( eol );
}
// indexed not yet implemented
// autoincrement
- if (this.isAutoIncrement())
+ if( this.isAutoIncrement() )
{
- result += " " + tags.getAttribute(AUTO_INCREMENT, "true") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( AUTO_INCREMENT, "true" ) );
+ result.append( eol );
}
// locking
- if (this.isLocking())
+ if( this.isLocking() )
{
- result += " " + tags.getAttribute(LOCKING, "true") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( LOCKING, "true" ) );
+ result.append( eol );
}
// updateLock
// default is true so only write if false
- if (!this.isUpdateLock())
+ if( !this.isUpdateLock() )
{
- result += " " + tags.getAttribute(UPDATE_LOCK, "false") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( UPDATE_LOCK, "false" ) );
+ result.append( eol );
}
// default-fetch not yet implemented
// conversion
- if (this.getFieldConversion().getClass() != FieldConversionDefaultImpl.class)
+ if( this.getFieldConversion().getClass() != FieldConversionDefaultImpl.class )
{
- result += " " + tags.getAttribute(FIELD_CONVERSION, getFieldConversion().getClass().getName()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( FIELD_CONVERSION, getFieldConversion().getClass().getName() ) );
+ result.append( eol );
}
// length
- if (this.isLengthSpecified())
+ if( this.isLengthSpecified() )
{
- result += " " + tags.getAttribute(LENGTH, "" + getLength()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( LENGTH, "" + getLength() ) );
+ result.append( eol );
}
// precision
- if (this.isPrecisionSpecified())
+ if( this.isPrecisionSpecified() )
{
- result += " " + tags.getAttribute(PRECISION, "" + getPrecision()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( PRECISION, "" + getPrecision() ) );
+ result.append( eol );
}
// scale
- if (this.isScaleSpecified())
+ if( this.isScaleSpecified() )
{
- result += " " + tags.getAttribute(SCALE, "" + getScale()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( SCALE, "" + getScale() ) );
+ result.append( eol );
}
// access
- result += " " + tags.getAttribute(ACCESS, this.getAccess()) + eol;
-
- result += " />" + eol;
- return result;
+ result.append( " " );
+ result.append( tags.getAttribute( ACCESS, this.getAccess() ) );
+ result.append( eol );
+
+ result.append( " />" );
+ result.append( eol );
+ return result.toString();
}
public Object clone()
1.7 +23 -17 db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java
Index: DeleteProcedureDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DeleteProcedureDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeleteProcedureDescriptor.java 4 Apr 2004 23:53:34 -0000 1.6
+++ DeleteProcedureDescriptor.java 13 Jun 2004 08:26:00 -0000 1.7
@@ -97,37 +97,43 @@
public String toXML()
{
RepositoryTags tags = RepositoryTags.getInstance();
- String eol = System.getProperty("line.separator");
+ String eol = System.getProperty( "line.separator" );
// The result
- String result = eol + " ";
+ StringBuffer result = new StringBuffer( 1024 );
+ result.append( eol );
+ result.append( " " );
// Opening tag and attributes
- result += " " + tags.getOpeningTagNonClosingById(DELETE_PROCEDURE);
- result += " " + tags.getAttribute(NAME, this.getName());
- if (this.hasReturnValue())
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( DELETE_PROCEDURE ) );
+ result.append( " " );
+ result.append( tags.getAttribute( NAME, this.getName() ) );
+ if( this.hasReturnValue() )
{
- result += " " + tags.getAttribute(RETURN_FIELD_REF, this.getReturnValueFieldRefName());
+ result.append( " " );
+ result.append( tags.getAttribute( RETURN_FIELD_REF, this.getReturnValueFieldRefName() ) );
}
- result += " "
- + tags.getAttribute(
- INCLUDE_PK_FIELDS_ONLY,
- String.valueOf(this.getIncludePkFieldsOnly()));
- result += ">" + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( INCLUDE_PK_FIELDS_ONLY, String.valueOf( this.getIncludePkFieldsOnly() ) ) );
+ result.append( ">" );
+ result.append( eol );
// Write all arguments only if we're not including all fields.
- if (!this.getIncludePkFieldsOnly())
+ if( !this.getIncludePkFieldsOnly() )
{
Iterator args = this.getArguments().iterator();
- while (args.hasNext())
+ while( args.hasNext() )
{
- result += ((ArgumentDescriptor) args.next()).toXML();
+ result.append( ( ( ArgumentDescriptor ) args.next() ).toXML() );
}
}
// Closing tag
- result += " " + tags.getClosingTagById(DELETE_PROCEDURE);
- return (result + eol);
+ result.append( " " );
+ result.append( tags.getClosingTagById( DELETE_PROCEDURE ) );
+ result.append( eol );
+ return result.toString();
}
//---------------------------------------------------------------
1.6 +26 -12 db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java
Index: ObjectCacheDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectCacheDescriptor.java 4 Apr 2004 23:53:34 -0000 1.5
+++ ObjectCacheDescriptor.java 13 Jun 2004 08:26:00 -0000 1.6
@@ -87,18 +87,27 @@
{
RepositoryTags tags = RepositoryTags.getInstance();
String eol = SystemUtils.LINE_SEPARATOR;
- StringBuffer buf = new StringBuffer();
+ StringBuffer buf = new StringBuffer(1024);
//opening tag + attributes
- buf.append(" " + tags.getOpeningTagNonClosingById(OBJECT_CACHE) + eol);
- buf.append(" " + tags.getAttribute(CLASS_NAME, ""
- + getObjectCache() != null ? getObjectCache().getName() : ""));
- buf.append(" >" + eol);
- buf.append(" <!-- "+eol);
- buf.append(" Add proprietary ObjectCache implementation properties here, using custom attributes" + eol);
- buf.append(" e.g. <attribute attribute-name=\"timeout\" attribute-value=\"2000\"/>" + eol);
- buf.append(" -->"+eol);
+ buf.append(" ");
+ buf.append(tags.getOpeningTagNonClosingById(OBJECT_CACHE));
+ buf.append(eol);
+ buf.append(" ");
+ buf.append(tags.getAttribute(CLASS_NAME, "" + getObjectCache() != null ? getObjectCache().getName() : ""));
+ buf.append(" >");
+ buf.append(eol);
+ buf.append(" <!-- ");
+ buf.append(eol);
+ buf.append(" Add proprietary ObjectCache implementation properties here, using custom attributes");
+ buf.append(eol);
+ buf.append(" e.g. <attribute attribute-name=\"timeout\" attribute-value=\"2000\"/>");
+ buf.append(eol);
+ buf.append(" -->");
+ buf.append(eol);
buf.append(buildAttributes());
- buf.append(" " + tags.getClosingTagById(OBJECT_CACHE)+eol);
+ buf.append(" ");
+ buf.append(tags.getClosingTagById(OBJECT_CACHE));
+ buf.append(eol);
return buf.toString();
}
@@ -109,13 +118,18 @@
Properties prop = getConfigurationProperties();
if(prop == null || prop.isEmpty()) return "";
- StringBuffer buf = new StringBuffer();
+ StringBuffer buf = new StringBuffer(1024);
Enumeration enum = prop.keys();
while (enum.hasMoreElements())
{
String key = (String) enum.nextElement();
String value = prop.getProperty(key);
- buf.append(" <attribute attribute-name=\""+key+"\" attribute-value=\""+value+"\"/>"+eol);
+ buf.append(" <attribute attribute-name=\"");
+ buf.append(key);
+ buf.append("\" attribute-value=\"");
+ buf.append(value);
+ buf.append("\"/>");
+ buf.append(eol);
}
return buf.toString();
}
1.7 +23 -15 db-ojb/src/java/org/apache/ojb/broker/metadata/InsertProcedureDescriptor.java
Index: InsertProcedureDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/InsertProcedureDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InsertProcedureDescriptor.java 4 Apr 2004 23:53:34 -0000 1.6
+++ InsertProcedureDescriptor.java 13 Jun 2004 08:26:00 -0000 1.7
@@ -94,35 +94,43 @@
public String toXML()
{
RepositoryTags tags = RepositoryTags.getInstance();
- String eol = System.getProperty("line.separator");
+ String eol = System.getProperty( "line.separator" );
// The result
- String result = eol + " ";
+ StringBuffer result = new StringBuffer( 1024 );
+ result.append( eol );
+ result.append( " " );
// Opening tag and attributes
- result += " " + tags.getOpeningTagNonClosingById(INSERT_PROCEDURE);
- result += " " + tags.getAttribute(NAME, this.getName());
- if (this.hasReturnValue())
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( INSERT_PROCEDURE ) );
+ result.append( " " );
+ result.append( tags.getAttribute( NAME, this.getName() ) );
+ if( this.hasReturnValue() )
{
- result += " " + tags.getAttribute(RETURN_FIELD_REF, this.getReturnValueFieldRefName());
+ result.append( " " );
+ result.append( tags.getAttribute( RETURN_FIELD_REF, this.getReturnValueFieldRefName() ) );
}
- result += " "
- + tags.getAttribute(INCLUDE_ALL_FIELDS, String.valueOf(this.getIncludeAllFields()));
- result += ">" + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( INCLUDE_ALL_FIELDS, String.valueOf( this.getIncludeAllFields() ) ) );
+ result.append( ">" );
+ result.append( eol );
// Write all arguments only if we're not including all fields.
- if (!this.getIncludeAllFields())
+ if( !this.getIncludeAllFields() )
{
Iterator args = this.getArguments().iterator();
- while (args.hasNext())
+ while( args.hasNext() )
{
- result += ((ArgumentDescriptor) args.next()).toXML();
+ result.append( ( ( ArgumentDescriptor ) args.next() ).toXML() );
}
}
// Closing tag
- result += " " + tags.getClosingTagById(INSERT_PROCEDURE);
- return (result + eol);
+ result.append( " " );
+ result.append( tags.getClosingTagById( INSERT_PROCEDURE ) );
+ result.append( eol );
+ return result.toString();
}
//---------------------------------------------------------------
1.7 +19 -11 db-ojb/src/java/org/apache/ojb/broker/metadata/UpdateProcedureDescriptor.java
Index: UpdateProcedureDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/UpdateProcedureDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpdateProcedureDescriptor.java 4 Apr 2004 23:53:34 -0000 1.6
+++ UpdateProcedureDescriptor.java 13 Jun 2004 08:26:01 -0000 1.7
@@ -98,18 +98,24 @@
String eol = System.getProperty("line.separator");
// The result
- String result = eol + " ";
+ StringBuffer result = new StringBuffer(1024);
+ result.append(eol);
+ result.append(" ");
// Opening tag and attributes
- result += " " + tags.getOpeningTagNonClosingById(UPDATE_PROCEDURE);
- result += " " + tags.getAttribute(NAME, this.getName());
+ result.append(" ");
+ result.append(tags.getOpeningTagNonClosingById(UPDATE_PROCEDURE));
+ result.append(" ");
+ result.append(tags.getAttribute(NAME, this.getName()) );
if (this.hasReturnValue())
{
- result += " " + tags.getAttribute(RETURN_FIELD_REF, this.getReturnValueFieldRefName());
+ result.append(" ");
+ result.append(tags.getAttribute(RETURN_FIELD_REF, this.getReturnValueFieldRefName()) );
}
- result += " "
- + tags.getAttribute(INCLUDE_ALL_FIELDS, String.valueOf(this.getIncludeAllFields()));
- result += ">" + eol;
+ result.append(" ");
+ result.append(tags.getAttribute(INCLUDE_ALL_FIELDS, String.valueOf(this.getIncludeAllFields())) );
+ result.append(">");
+ result.append(eol);
// Write all arguments only if we're not including all fields.
if (!this.getIncludeAllFields())
@@ -117,13 +123,15 @@
Iterator args = this.getArguments().iterator();
while (args.hasNext())
{
- result += ((ArgumentDescriptor) args.next()).toXML();
+ result.append(((ArgumentDescriptor) args.next()).toXML());
}
}
// Closing tag
- result += " " + tags.getClosingTagById(UPDATE_PROCEDURE);
- return (result + eol);
+ result.append(" ");
+ result.append(tags.getClosingTagById(UPDATE_PROCEDURE));
+ result.append(eol);
+ return result.toString();
}
//---------------------------------------------------------------
1.11 +31 -15 db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java
Index: SequenceDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/SequenceDescriptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SequenceDescriptor.java 4 Apr 2004 23:53:34 -0000 1.10
+++ SequenceDescriptor.java 13 Jun 2004 08:26:01 -0000 1.11
@@ -100,17 +100,27 @@
{
RepositoryTags tags = RepositoryTags.getInstance();
String eol = SystemUtils.LINE_SEPARATOR;
- StringBuffer buf = new StringBuffer();
+ StringBuffer buf = new StringBuffer( 1024 );
//opening tag + attributes
- buf.append(" " + tags.getOpeningTagNonClosingById(SEQUENCE_MANAGER) + eol);
- buf.append(" " + tags.getAttribute(SEQUENCE_MANAGER_CLASS, "" + getSequenceManagerClass().getName()));
- buf.append(" >" + eol);
- buf.append(" <!-- "+eol);
- buf.append(" Add sequence manger properties here, using custom attributes" + eol);
- buf.append(" e.g. <attribute attribute-name=\"grabSize\" attribute-value=\"20\"/>" + eol);
- buf.append(" -->"+eol);
- buf.append(buildAttributes());
- buf.append(" " + tags.getClosingTagById(SEQUENCE_MANAGER)+eol);
+ buf.append( " " );
+ buf.append( tags.getOpeningTagNonClosingById( SEQUENCE_MANAGER ) );
+ buf.append( eol );
+ buf.append( " " );
+ buf.append( tags.getAttribute( SEQUENCE_MANAGER_CLASS, "" + getSequenceManagerClass().getName() ) );
+ buf.append( " >" );
+ buf.append( eol );
+ buf.append( " <!-- " );
+ buf.append( eol );
+ buf.append( " Add sequence manger properties here, using custom attributes" );
+ buf.append( eol );
+ buf.append( " e.g. <attribute attribute-name=\"grabSize\" attribute-value=\"20\"/>" );
+ buf.append( eol );
+ buf.append( " -->" );
+ buf.append( eol );
+ buf.append( buildAttributes() );
+ buf.append( " " );
+ buf.append( tags.getClosingTagById( SEQUENCE_MANAGER ) );
+ buf.append( eol );
return buf.toString();
}
@@ -119,15 +129,21 @@
{
String eol = SystemUtils.LINE_SEPARATOR;
Properties prop = getConfigurationProperties();
- if(prop == null || prop.isEmpty()) return "";
+ if( prop == null || prop.isEmpty() )
+ return "";
StringBuffer buf = new StringBuffer();
Enumeration enum = prop.keys();
- while (enum.hasMoreElements())
+ while( enum.hasMoreElements() )
{
- String key = (String) enum.nextElement();
- String value = prop.getProperty(key);
- buf.append(" <attribute attribute-name=\""+key+"\" attribute-value=\""+value+"\"/>"+eol);
+ String key = ( String ) enum.nextElement();
+ String value = prop.getProperty( key );
+ buf.append( " <attribute attribute-name=\"" );
+ buf.append( key );
+ buf.append( "\" attribute-value=\"" );
+ buf.append( value );
+ buf.append( "\"/>" );
+ buf.append( eol );
}
return buf.toString();
}
1.37 +65 -33 db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java
Index: ObjectReferenceDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ObjectReferenceDescriptor.java 4 Apr 2004 23:53:34 -0000 1.36
+++ ObjectReferenceDescriptor.java 13 Jun 2004 08:26:01 -0000 1.37
@@ -499,75 +499,107 @@
public String toXML()
{
RepositoryTags tags = RepositoryTags.getInstance();
- String eol = System.getProperty("line.separator");
+ String eol = System.getProperty( "line.separator" );
// opening tag
- String result = " " + tags.getOpeningTagNonClosingById(REFERENCE_DESCRIPTOR) + eol;
+ StringBuffer result = new StringBuffer( 1024 );
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( REFERENCE_DESCRIPTOR ) );
+ result.append( eol );
// attributes
// name
String name = this.getAttributeName();
- if (name == null)
+ if( name == null )
{
- name = RepositoryElements.TAG_SUPER;
+ name = RepositoryElements.TAG_SUPER;
}
- result += " " + tags.getAttribute(FIELD_NAME, name) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( FIELD_NAME, name ) );
+ result.append( eol );
// class-ref
- result += " " + tags.getAttribute(REFERENCED_CLASS, this.getItemClassName()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( REFERENCED_CLASS, this.getItemClassName() ) );
+ result.append( eol );
// proxyReference is optional
- if (isLazy())
+ if( isLazy() )
{
- result += " " + tags.getAttribute(PROXY_REFERENCE, "true") + eol;
- result += " " + tags.getAttribute(PROXY_PREFETCHING_LIMIT, "" + this.getProxyPrefetchingLimit()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( PROXY_REFERENCE, "true" ) );
+ result.append( eol );
+ result.append( " " );
+ result.append( tags.getAttribute( PROXY_PREFETCHING_LIMIT, "" + this.getProxyPrefetchingLimit() ) );
+ result.append( eol );
}
//reference refresh is optional, disabled by default
- if (isRefresh())
+ if( isRefresh() )
{
- result += " " + tags.getAttribute(REFRESH, "true") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( REFRESH, "true" ) );
+ result.append( eol );
}
//auto retrieve
- result += " " + tags.getAttribute(AUTO_RETRIEVE, "" + getCascadeRetrieve()) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( AUTO_RETRIEVE, "" + getCascadeRetrieve() ) );
+ result.append( eol );
//auto update
- result += " " + tags.getAttribute(AUTO_UPDATE, getCascadeAsString(getCascadingStore())) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( AUTO_UPDATE, getCascadeAsString( getCascadingStore() ) ) );
+ result.append( eol );
//auto delete
- result += " " + tags.getAttribute(AUTO_DELETE, getCascadeAsString(getCascadingDelete())) + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( AUTO_DELETE, getCascadeAsString( getCascadingDelete() ) ) );
+ result.append( eol );
//otm-dependent is optional, disabled by default
- if (getOtmDependent())
+ if( getOtmDependent() )
{
- result += " " + tags.getAttribute(OTM_DEPENDENT, "true") + eol;
+ result.append( " " );
+ result.append( tags.getAttribute( OTM_DEPENDENT, "true" ) );
+ result.append( eol );
}
// close opening tag
- result += " >" + eol;
+ result.append( " >" );
+ result.append( eol );
// elements
// write foreignkey elements
- for (int i = 0; i < getForeignKeyFields().size(); i++)
+ for( int i = 0; i < getForeignKeyFields().size(); i++ )
{
- Object obj = getForeignKeyFields().get(i);
- if (obj instanceof Integer)
- {
- String fkId = obj.toString();
- result += " " + tags.getOpeningTagNonClosingById(FOREIGN_KEY) + " ";
- result += tags.getAttribute(FIELD_ID_REF, fkId) + "/>" + eol;
- }
- else
- {
- String fk = (String) obj;
- result += " " + tags.getOpeningTagNonClosingById(FOREIGN_KEY) + " ";
- result += tags.getAttribute(FIELD_REF, fk) + "/>" + eol;
- }
+ Object obj = getForeignKeyFields().get( i );
+ if( obj instanceof Integer )
+ {
+ String fkId = obj.toString();
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( FOREIGN_KEY ) );
+ result.append( " " );
+ result.append( tags.getAttribute( FIELD_ID_REF, fkId ) );
+ result.append( "/>" );
+ result.append( eol );
+ }
+ else
+ {
+ String fk = ( String ) obj;
+ result.append( " " );
+ result.append( tags.getOpeningTagNonClosingById( FOREIGN_KEY ) );
+ result.append( " " );
+ result.append( tags.getAttribute( FIELD_REF, fk ) );
+ result.append( "/>" );
+ result.append( eol );
+ }
}
// closing tag
- result += " " + tags.getClosingTagById(REFERENCE_DESCRIPTOR) + eol;
- return result;
+ result.append( " " );
+ result.append( tags.getClosingTagById( REFERENCE_DESCRIPTOR ) );
+ result.append( eol );
+ return result.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org