cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r733833 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
Date Mon, 12 Jan 2009 16:27:37 GMT
Author: aadamchik
Date: Mon Jan 12 08:27:22 2009
New Revision: 733833

URL: http://svn.apache.org/viewvc?rev=733833&view=rev
Log:
cleaning up comments

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java?rev=733833&r1=733832&r2=733833&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
Mon Jan 12 08:27:22 2009
@@ -42,7 +42,6 @@
 /**
  * Default MapLoader. Its responsibilities include reading DataMaps from XML files and
  * saving DataMap objects back to XML.
- * 
  */
 public class MapLoader extends DefaultHandler {
 
@@ -100,7 +99,7 @@
     // Query-related
     public static final String QUERY_TAG = "query";
 
-    public static final String QUERY_SQL_TAG = "sql";    
+    public static final String QUERY_SQL_TAG = "sql";
     public static final String QUERY_EJBQL_TAG = "ejbql";
     public static final String QUERY_QUALIFIER_TAG = "qualifier";
     public static final String QUERY_ORDERING_TAG = "ordering";
@@ -152,7 +151,7 @@
     private Procedure procedure;
     private QueryLoader queryBuilder;
     private String sqlKey;
-    private String ejbqlKey;    
+    private String ejbqlKey;
     private String descending;
     private String ignoreCase;
 
@@ -285,8 +284,8 @@
             void execute(Attributes attributes) throws SAXException {
                 processStartProcedure(attributes);
             }
-        });        
-       
+        });
+
         startTagOpMap.put(QUERY_EJBQL_TAG, new StartClosure() {
 
             @Override
@@ -529,8 +528,7 @@
                 processEndQuerySQL();
             }
         });
-        
-       ////////////////////////////////////////// 
+
         endTagOpMap.put(QUERY_EJBQL_TAG, new EndClosure() {
 
             @Override
@@ -538,7 +536,7 @@
                 processEndEjbqlQuery();
             }
         });
-        
+
         endTagOpMap.put(QUERY_QUALIFIER_TAG, new EndClosure() {
 
             @Override
@@ -714,7 +712,7 @@
         catch (IOException e) {
             throw new CayenneRuntimeException(e);
         }
-        
+
         try {
             InputSource inSrc = new InputSource(in);
             inSrc.setSystemId(uri);
@@ -757,12 +755,13 @@
     /**
      * Creates, configures and returns ResourceLocator object used to lookup DataMap
      * files.
+     * 
      * @deprecated since 3.0 use {@link #createResourceFinder()}.
      */
     protected ResourceLocator configLocator() {
         return (ResourceLocator) createResourceFinder();
     }
-    
+
     /**
      * Creates, configures and returns a default ResourceFinder.
      * 
@@ -780,7 +779,6 @@
         locator.setSkipHomeDirectory(true);
         return locator;
     }
-    
 
     @Override
     public void startElement(
@@ -894,12 +892,10 @@
     private void processStartQuerySQL(Attributes atts) {
         this.sqlKey = convertClassNameFromV1_2(atts.getValue("", "adapter-class"));
     }
-    
-    ///////////////////////////////
+
     private void processStartEjbqlQuery(Attributes atts) throws SAXException {
         this.ejbqlKey = convertClassNameFromV1_2(atts.getValue("", "adapter-class"));
     }
-    
 
     private void processStartObjEntity(Attributes atts) {
         objEntity = new ObjEntity(atts.getValue("", "name"));
@@ -908,7 +904,7 @@
 
         String isAbstract = atts.getValue("", "abstract");
         objEntity.setAbstract(TRUE.equalsIgnoreCase(isAbstract));
-        
+
         String readOnly = atts.getValue("", "readOnly");
         objEntity.setReadOnly(TRUE.equalsIgnoreCase(readOnly));
 
@@ -964,7 +960,7 @@
     private void processStartAttributeOverride(Attributes atts) {
         String name = atts.getValue("", "name");
         String dbPath = atts.getValue("", "db-attribute-path");
-        
+
         objEntity.addAttributeOverride(name, dbPath);
     }
 
@@ -1088,8 +1084,6 @@
         dataMap.addProcedure(procedure);
     }
 
-  
-    
     private void processStartProcedureParameter(Attributes attributes)
             throws SAXException {
 
@@ -1225,13 +1219,11 @@
         queryBuilder = null;
     }
 
-    ///////////////////////////////////////////////
-
     private void processEndEjbqlQuery() throws SAXException {
         queryBuilder.setEjbql(charactersBuffer.toString());
         ejbqlKey = null;
     }
-    
+
     private void processEndQuerySQL() {
         queryBuilder.addSql(charactersBuffer.toString(), sqlKey);
         sqlKey = null;



Mime
View raw message