[Xulu-commits] r35 - in trunk/src: appl/parallel/data/splittable appl/parallel/data/xulugridfile/factories edu/bonn/xulu/plugin/io/grid/array edu/bonn/xulu/plugin/io/grid/awt edu/bonn/xulu/plugin/io/grid/gt edu/bonn/xulu/plugin/io/grid/lateloading

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Jul 6 12:40:02 CEST 2009


Author: alfonx
Date: 2009-07-06 12:40:01 +0200 (Mon, 06 Jul 2009)
New Revision: 35

Modified:
   trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java
   trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java
   trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java
   trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java
   trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
   trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java
Log:
* Refactored   

public static String getBaseFileName(File file) {
    int extIdx = getFileExtIdx(file);
    
to 

public static String getBaseFilePath(File file) {
    int extIdx = getFileExtIdx(file);

because not only the name (as in File.getName() ) was returned, but the File.getPath() without the postfix. As i did refactoring, all references in Atlas, ISDSS, XULU and schmitzm should be changed to getBaseFilePath automatically.

* Created a method getBaseFileName(File file) that really just return the filename without it's extension.

Modified: trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -147,7 +147,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren

Modified: trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -165,7 +165,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren

Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -147,7 +147,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren

Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -153,7 +153,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren

Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -154,7 +154,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren

Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java	2009-06-22 10:23:25 UTC (rev 34)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java	2009-07-06 10:40:01 UTC (rev 35)
@@ -170,7 +170,7 @@
       throw new IllegalArgumentException(getClass().getName().concat(" can not export instances of ").concat(object.getClass().getName()));
 
     // Dateinamen-Teile ermitteln
-    String fileName = IOUtil.getBaseFileName((File)output);
+    String fileName = IOUtil.getBaseFilePath((File)output);
     String fileExt  = IOUtil.getFileExt((File)output);
 
     // Grids in der Liste einzeln exportieren



More information about the Xulu-commits mailing list