cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r924323 - in /cayenne/main/trunk/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/
Date Wed, 17 Mar 2010 15:03:56 GMT
Author: oltka
Date: Wed Mar 17 15:03:54 2010
New Revision: 924323

URL: http://svn.apache.org/viewvc?rev=924323&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapTest.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileFilters.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=924323&r1=924322&r2=924323&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
Wed Mar 17 15:03:54 2010
@@ -135,8 +135,8 @@ public class MapLoader extends DefaultHa
      * @since 3.0
      */
     public static final String JAVA_CLASS_ROOT = "java-class";
-    
-    public static final String LOCATION_SUFFIX = ".map.xml";
+
+    private static final String DATA_MAP_LOCATION_SUFFIX = ".map.xml";
 
     // Reading from XML
     private String mapVersion;
@@ -813,9 +813,9 @@ public class MapLoader extends DefaultHa
             location = location.substring(lastSlash + 1);
         }
 
-        if (location.endsWith(LOCATION_SUFFIX)) {
+        if (location.endsWith(DATA_MAP_LOCATION_SUFFIX)) {
             location = location.substring(0, location.length()
-                    - LOCATION_SUFFIX.length());
+                    - DATA_MAP_LOCATION_SUFFIX.length());
         }
 
         return location;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapTest.java?rev=924323&r1=924322&r2=924323&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapTest.java
Wed Mar 17 15:03:54 2010
@@ -406,23 +406,24 @@ public class DataMapTest extends TestCas
         }
     }
 
-
-    public void testQuoteSqlIdentifiersEncodeAsXML(){
+    public void testQuoteSqlIdentifiersEncodeAsXML() {
         DataMap map = new DataMap("aaa");
         map.setQuotingSQLIdentifiers(true);
         StringWriter w = new StringWriter();
         XMLEncoder encoder = new XMLEncoder(new PrintWriter(w));
         map.encodeAsXML(encoder);
-        
+
         assertTrue(map.quotingSQLIdentifiers);
-        
+
         MapLoader loader = new MapLoader();
         try {
-            InputStream is = new ByteArrayInputStream(w.getBuffer().toString().getBytes("UTF-8"));
+            InputStream is = new ByteArrayInputStream(w.getBuffer().toString().getBytes(
+                    "UTF-8"));
             DataMap newMap = loader.loadDataMap(new InputSource(is));
             assertTrue(newMap.quotingSQLIdentifiers);
-            
-        } catch (UnsupportedEncodingException e) {
+
+        }
+        catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
 
@@ -430,14 +431,16 @@ public class DataMapTest extends TestCas
         StringWriter w2 = new StringWriter();
         XMLEncoder encoder2 = new XMLEncoder(new PrintWriter(w2));
         map.encodeAsXML(encoder2);
-        
+
         assertFalse(map.quotingSQLIdentifiers);
         try {
-            InputStream is = new ByteArrayInputStream(w2.getBuffer().toString().getBytes("UTF-8"));
+            InputStream is = new ByteArrayInputStream(w2.getBuffer().toString().getBytes(
+                    "UTF-8"));
             DataMap newMap = loader.loadDataMap(new InputSource(is));
             assertFalse(newMap.quotingSQLIdentifiers);
-            
-        } catch (UnsupportedEncodingException e) {
+
+        }
+        catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
 

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileFilters.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileFilters.java?rev=924323&r1=924322&r2=924323&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileFilters.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileFilters.java
Wed Mar 17 15:03:54 2010
@@ -22,8 +22,6 @@ package org.apache.cayenne.modeler.util;
 import java.io.File;
 import javax.swing.filechooser.FileFilter;
 
-import org.apache.cayenne.map.MapLoader;
-
 /**
  * A collection of common file filters used by CayenneModeler JFileChoosers.
  * 
@@ -38,6 +36,8 @@ public class FileFilters {
     protected static final FileFilter dataMapFilter = new DataMapFileFilter();
     protected static final FileFilter classArchiveFilter = new JavaClassArchiveFilter();
 
+    private static final String DATA_MAP_LOCATION_SUFFIX = ".map.xml";
+
     /**
      * Returns a FileFilter for java class archive files, such as JAR and ZIP.
      */
@@ -60,8 +60,8 @@ public class FileFilters {
     }
 
     /**
-     * Returns a FileFilter used to select Velocity template files. 
-     * Filters files with ".vm" extension.
+     * Returns a FileFilter used to select Velocity template files. Filters files with
+     * ".vm" extension.
      */
     public static FileFilter getVelotemplateFilter() {
         return velotemplateFilter;
@@ -76,20 +76,19 @@ public class FileFilters {
     }
 
     /**
-     * Returns FileFilter that defines the rules for EOModel selection.
-     * This filter will only allow selection of the following 
-     * files/directories:
+     * Returns FileFilter that defines the rules for EOModel selection. This filter will
+     * only allow selection of the following files/directories:
      * <ul>
-     *   <li>Directories with name matching <code>*.eomodeld</code>
-     *   that contain <code>index.eomodeld</code>.</li>
-     *   <li><code>index.eomodeld</code> files contained within 
-     *   <code>*.eomodeld</code> directory.</li>
+     * <li>Directories with name matching <code>*.eomodeld</code> that
contain
+     * <code>index.eomodeld</code>.</li>
+     * <li><code>index.eomodeld</code> files contained within <code>*.eomodeld</code>
+     * directory.</li>
      * </ul>
      */
     public static FileFilter getEOModelSelectFilter() {
         return eomodelSelectFilter;
     }
-    
+
     /**
      * Returns filter that checks if file has specified extension
      */
@@ -98,6 +97,7 @@ public class FileFilters {
     }
 
     static final class JavaClassArchiveFilter extends FileFilter {
+
         public boolean accept(File f) {
             if (f.isDirectory()) {
                 return true;
@@ -113,6 +113,7 @@ public class FileFilters {
     }
 
     static final class VelotemplateFileFilter extends FileFilter {
+
         /**
          * Accepts all *.vm files.
          */
@@ -137,11 +138,11 @@ public class FileFilters {
          */
         public boolean accept(File f) {
             return f.isDirectory()
-                || (f.getName().startsWith("cayenne") && f.getName().endsWith(".xml"));
+                    || (f.getName().startsWith("cayenne") && f.getName().endsWith(".xml"));
         }
 
         /**
-         *  Returns description of this filter.
+         * Returns description of this filter.
          */
         public String getDescription() {
             return "Cayenne Applications (" + "cayenne*.xml" + ")";
@@ -159,8 +160,8 @@ public class FileFilters {
             }
 
             String name = f.getName();
-            if (name.endsWith(MapLoader.LOCATION_SUFFIX)
-                && !name.equals(MapLoader.LOCATION_SUFFIX)) {
+            if (name.endsWith(DATA_MAP_LOCATION_SUFFIX)
+                    && !name.equals(DATA_MAP_LOCATION_SUFFIX)) {
                 return true;
             }
 
@@ -168,14 +169,15 @@ public class FileFilters {
         }
 
         /**
-         *  Returns description of this filter.
+         * Returns description of this filter.
          */
         public String getDescription() {
-            return "DataMaps (*" + MapLoader.LOCATION_SUFFIX + ")";
+            return "DataMaps (*" + DATA_MAP_LOCATION_SUFFIX + ")";
         }
     }
 
     static final class EOModelFileFilter extends FileFilter {
+
         static final String EOM_SUFFIX = ".eomodeld";
         static final String EOM_INDEX = "index" + EOM_SUFFIX;
 
@@ -189,8 +191,8 @@ public class FileFilters {
 
             File parent = f.getParentFile();
             return parent != null
-                && parent.getName().endsWith(EOM_SUFFIX)
-                && EOM_INDEX.equals(f.getName());
+                    && parent.getName().endsWith(EOM_SUFFIX)
+                    && EOM_INDEX.equals(f.getName());
         }
 
         public String getDescription() {
@@ -199,15 +201,16 @@ public class FileFilters {
     }
 
     static final class EOModelSelectFilter extends FileFilter {
+
         /**
          * Accepts all directories and <code>*.eomodeld/index.eomodeld</code>
files.
-         *
+         * 
          * @see EOModelSelectFilter#accept(File)
          */
         public boolean accept(File f) {
             if (f.isDirectory()) {
                 if (f.getName().endsWith(EOModelFileFilter.EOM_SUFFIX)
-                    && new File(f, EOModelFileFilter.EOM_INDEX).exists()) {
+                        && new File(f, EOModelFileFilter.EOM_INDEX).exists()) {
 
                     return true;
                 }
@@ -215,8 +218,8 @@ public class FileFilters {
             else if (f.isFile()) {
                 File parent = f.getParentFile();
                 if (parent != null
-                    && parent.getName().endsWith(EOModelFileFilter.EOM_SUFFIX)
-                    && EOModelFileFilter.EOM_INDEX.equals(f.getName())) {
+                        && parent.getName().endsWith(EOModelFileFilter.EOM_SUFFIX)
+                        && EOModelFileFilter.EOM_INDEX.equals(f.getName())) {
                     return true;
                 }
             }
@@ -233,9 +236,10 @@ public class FileFilters {
      * filter that checks if file has specified extension
      */
     static final class ExtensionFileFilter extends FileFilter {
+
         String ext;
         String description;
-        
+
         ExtensionFileFilter(String ext, String description) {
             this.ext = ext;
             this.description = description;
@@ -250,6 +254,6 @@ public class FileFilters {
         public String getDescription() {
             return description + "(." + ext + ")";
         }
-        
+
     }
 }



Mime
View raw message