diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
index c2d656e57..91669261a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
@@ -697,7 +697,7 @@ public class Project
{
log( "Trying to override old definition of task " + taskName,
MSG_WARN );
- invalidateCreatedTasks( taskName );
+
}
}
@@ -1311,29 +1311,4 @@ public class Project
listener.messageLogged( event );
}
}
-
- /**
- * Mark tasks as invalid which no longer are of the correct type for a given
- * taskname.
- *
- * @param type Description of Parameter
- */
- private void invalidateCreatedTasks( String type )
- {
- synchronized( createdTasks )
- {
- Vector v = (Vector)createdTasks.get( type );
- if( v != null )
- {
- Enumeration enum = v.elements();
- while( enum.hasMoreElements() )
- {
- Task t = (Task)enum.nextElement();
- t.markInvalid();
- }
- v.removeAllElements();
- createdTasks.remove( type );
- }
- }
- }
}
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
index 9efcc0482..9fc7594f1 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -1018,7 +1018,6 @@ public class ProjectHelper
task.setTaskName( tag );
}
- task.setLocation( new Location( buildFile.toString(), locator.getLineNumber(), locator.getColumnNumber() ) );
configureId( task, attrs );
// Top level tasks don't have associated targets
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
index 69f21d197..1b3dbbcd2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
@@ -250,7 +250,6 @@ public class UnknownElement extends Task
if( task != null )
{
- task.setLocation( getLocation() );
// UnknownElement always has an associated target
task.setOwningTarget( target );
task.init();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
index b8288c89b..38064db4c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -305,7 +305,6 @@ public class Get extends Task
Touch touch = (Touch)project.createTask( "touch" );
touch.setOwningTarget( target );
touch.setTaskName( getTaskName() );
- touch.setLocation( getLocation() );
touch.setFile( file );
touch.setMillis( timemillis );
touch.touch();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 6c8ce5f0f..630edc3e4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -74,7 +74,7 @@ public class Tstamp extends Task
while( i.hasMoreElements() )
{
CustomFormat cts = (CustomFormat)i.nextElement();
- cts.execute( project, d, location );
+ cts.execute( project, d );
}
}
@@ -207,7 +207,7 @@ public class Tstamp extends Task
field = unit.getCalendarField();
}
- public void execute( Project project, Date date, Location location )
+ public void execute( Project project, Date date )
throws TaskException
{
if( propertyName == null )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index ec8d66451..e3dc8d5a4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -51,7 +51,6 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
protected Path extdirs;
protected boolean includeAntRuntime;
protected boolean includeJavaRuntime;
- protected Location location;
protected String memoryInitialSize;
protected String memoryMaximumSize;
protected Project project;
@@ -80,7 +79,6 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
compileList = attributes.getFileList();
compileClasspath = attributes.getClasspath();
project = attributes.getProject();
- location = attributes.getLocation();
includeAntRuntime = attributes.getIncludeantruntime();
includeJavaRuntime = attributes.getIncludejavaruntime();
memoryInitialSize = attributes.getMemoryInitialSize();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 91961f7dd..ef240ca8d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -460,11 +460,6 @@ public class GenericDeploymentTool implements EJBDeploymentTool
return baseName;
}
- protected Location getLocation()
- {
- return getTask().getLocation();
- }
-
/**
* Returns the Public ID of the DTD specified in the EJB descriptor. Not
* every vendor-specific DeploymentTool will need to reference
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
index c2d656e57..91669261a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
@@ -697,7 +697,7 @@ public class Project
{
log( "Trying to override old definition of task " + taskName,
MSG_WARN );
- invalidateCreatedTasks( taskName );
+
}
}
@@ -1311,29 +1311,4 @@ public class Project
listener.messageLogged( event );
}
}
-
- /**
- * Mark tasks as invalid which no longer are of the correct type for a given
- * taskname.
- *
- * @param type Description of Parameter
- */
- private void invalidateCreatedTasks( String type )
- {
- synchronized( createdTasks )
- {
- Vector v = (Vector)createdTasks.get( type );
- if( v != null )
- {
- Enumeration enum = v.elements();
- while( enum.hasMoreElements() )
- {
- Task t = (Task)enum.nextElement();
- t.markInvalid();
- }
- v.removeAllElements();
- createdTasks.remove( type );
- }
- }
- }
}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
index 9efcc0482..9fc7594f1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
@@ -1018,7 +1018,6 @@ public class ProjectHelper
task.setTaskName( tag );
}
- task.setLocation( new Location( buildFile.toString(), locator.getLineNumber(), locator.getColumnNumber() ) );
configureId( task, attrs );
// Top level tasks don't have associated targets
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
index 69f21d197..1b3dbbcd2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
@@ -250,7 +250,6 @@ public class UnknownElement extends Task
if( task != null )
{
- task.setLocation( getLocation() );
// UnknownElement always has an associated target
task.setOwningTarget( target );
task.init();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
index b8288c89b..38064db4c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
@@ -305,7 +305,6 @@ public class Get extends Task
Touch touch = (Touch)project.createTask( "touch" );
touch.setOwningTarget( target );
touch.setTaskName( getTaskName() );
- touch.setLocation( getLocation() );
touch.setFile( file );
touch.setMillis( timemillis );
touch.touch();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
index 6c8ce5f0f..630edc3e4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -74,7 +74,7 @@ public class Tstamp extends Task
while( i.hasMoreElements() )
{
CustomFormat cts = (CustomFormat)i.nextElement();
- cts.execute( project, d, location );
+ cts.execute( project, d );
}
}
@@ -207,7 +207,7 @@ public class Tstamp extends Task
field = unit.getCalendarField();
}
- public void execute( Project project, Date date, Location location )
+ public void execute( Project project, Date date )
throws TaskException
{
if( propertyName == null )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index ec8d66451..e3dc8d5a4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -51,7 +51,6 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
protected Path extdirs;
protected boolean includeAntRuntime;
protected boolean includeJavaRuntime;
- protected Location location;
protected String memoryInitialSize;
protected String memoryMaximumSize;
protected Project project;
@@ -80,7 +79,6 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
compileList = attributes.getFileList();
compileClasspath = attributes.getClasspath();
project = attributes.getProject();
- location = attributes.getLocation();
includeAntRuntime = attributes.getIncludeantruntime();
includeJavaRuntime = attributes.getIncludejavaruntime();
memoryInitialSize = attributes.getMemoryInitialSize();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 91961f7dd..ef240ca8d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -460,11 +460,6 @@ public class GenericDeploymentTool implements EJBDeploymentTool
return baseName;
}
- protected Location getLocation()
- {
- return getTask().getLocation();
- }
-
/**
* Returns the Public ID of the DTD specified in the EJB descriptor. Not
* every vendor-specific DeploymentTool will need to reference