[openorb-commits] CVS: OpenORB/src/compiler/org/openorb/compiler/taskdefs Java2Idl.java,1.9,1.10 Idl2Java.java,1.16,1.17 GenericTask.java,1.10,1.11

[<lk...@us...>]

Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20370/src/compiler/org/openorb/compiler/taskdefs

Modified Files:
	Java2Idl.java Idl2Java.java GenericTask.java 
Log Message:
replaced usage of inherited fields 'project' and 'location' with accessor methods with 

Index: Java2Idl.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/Java2Idl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Java2Idl.java	10 Feb 2004 21:46:19 -0000	1.9
+++ Java2Idl.java	13 Mar 2005 13:05:18 -0000	1.10
@@ -271,7 +271,7 @@
         else
         {
             m_param_exception =
-                new BuildException( "Invalid symbol definition", location );
+                new BuildException( "Invalid symbol definition", getLocation() );
         }
     }
 
@@ -301,7 +301,7 @@
             m_param_exception =
                 new BuildException(
                     "Invalid native mapping definition",
-                    location );
+                    getLocation() );
         }
     }
 

Index: Idl2Java.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/Idl2Java.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Idl2Java.java	10 Feb 2004 21:02:42 -0000	1.16
+++ Idl2Java.java	13 Mar 2005 13:05:19 -0000	1.17
@@ -245,7 +245,7 @@
         else
         {
             m_param_exception =
-                new BuildException( "Invalid symbol definition", location );
+                new BuildException( "Invalid symbol definition", getLocation() );
         }
     }
 
@@ -275,7 +275,7 @@
             m_param_exception =
                 new BuildException(
                     "Invalid native mapping definition",
-                    location );
+                    getLocation() );
         }
     }
 

Index: GenericTask.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/GenericTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- GenericTask.java	10 Feb 2004 21:02:42 -0000	1.10
+++ GenericTask.java	13 Mar 2005 13:05:19 -0000	1.11
@@ -138,7 +138,7 @@
     {
         if ( m_src_path == null )
         {
-            m_src_path = new Path( project );
+            m_src_path = new Path( getProject() );
         }
 
         return m_src_path.createPath();
@@ -242,7 +242,7 @@
             }
             catch ( org.openorb.compiler.parser.CompilationException ex )
             {
-                throw new BuildException( "there are errors...", location );
+                throw new BuildException( "there are errors...", getLocation() );
             }
 
             // write the dependency cache to disk
@@ -319,25 +319,25 @@
         // load the IDL file list from the include and path structures
         if ( m_src_path == null )
         {
-            throw new BuildException( "srcdir attribute must be set!", location );
+            throw new BuildException( "srcdir attribute must be set!", getLocation() );
         }
 
         if ( m_src_path.size() == 0 )
         {
-            throw new BuildException( "srcdir attribute must be set!", location );
+            throw new BuildException( "srcdir attribute must be set!", getLocation() );
         }
 
         String[] list = m_src_path.list();
 
         for ( int jl = 0; jl < list.length; jl++ )
         {
-            File srcDir = project.resolveFile( list[ jl ] );
+            File srcDir = getProject().resolveFile( list[ jl ] );
 
             if ( !srcDir.exists() )
             {
                 throw new BuildException(
                     "srcdir \"" + srcDir.getPath() + "\" doesn't exist!",
-                    location );
+                    getLocation() );
             }
 
             if ( srcDir.isDirectory() )