Browse Source

Ran IDEAs new audit features across codebase to pick up a few anomalies

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271861 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
58a63d97be
13 changed files with 17 additions and 17 deletions
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
  2. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
  3. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java
  4. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypelibDescriptor.java
  5. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
  6. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java
  7. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
  8. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
  9. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
  10. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
  11. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
  12. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
  13. +1
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java

+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java View File

@@ -51,7 +51,7 @@ public class DefaultAspectManager
rebuildArrays();
}

public synchronized void removeAspectHandler( final String name, final AspectHandler handler )
public synchronized void removeAspectHandler( final String name )
throws TaskException
{
final AspectHandler entry = (AspectHandler)m_aspectMap.remove( name );


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java View File

@@ -59,7 +59,7 @@ class DefaultObjectConfigurer
* created configurer will not handle any attributes, elements, or content.
* Use the various <code>enable</code> methods to enable handling of these.
*/
public DefaultObjectConfigurer( final Class classInfo )
private DefaultObjectConfigurer( final Class classInfo )
{
m_class = classInfo;
}
@@ -67,7 +67,7 @@ class DefaultObjectConfigurer
/**
* Enables all properties and content handling.
*/
public void enableAll()
private void enableAll()
throws ConfigurationException
{
enableProperties();


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java View File

@@ -72,7 +72,7 @@ class TypeDescriptorBuilder
/**
* Creates a type definition.
*/
public TypeDefinition createTypeDefinition( final Configuration configuration )
private TypeDefinition createTypeDefinition( final Configuration configuration )
throws ConfigurationException
{
final String roleShorthand = configuration.getName();


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypelibDescriptor.java View File

@@ -17,7 +17,7 @@ class TypelibDescriptor
{
private final String m_url;

public TypelibDescriptor( final String url )
protected TypelibDescriptor( final String url )
{
m_url = url;
}


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java View File

@@ -328,7 +328,7 @@ public class AspectAwareExecutor
return parameters;
}

protected final AspectManager getAspectManager()
private final AspectManager getAspectManager()
{
return m_aspectManager;
}


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java View File

@@ -117,7 +117,7 @@ public class DefaultExtensionManager
return tools;
}

private Extension createToolsExtension()
private static Extension createToolsExtension()
{
return new Extension( "com.sun.tools",
"1.0",


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java View File

@@ -99,8 +99,8 @@ public class DefaultPropertyResolver
* @return the reolved property
* @exception TaskException if an error occurs
*/
protected Object recursiveResolveProperty( final String content,
final Context context )
private Object recursiveResolveProperty( final String content,
final Context context )
throws TaskException
{
int start = findNextProperty( content, 0 );


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java View File

@@ -44,7 +44,7 @@ public class DefaultTypeManager
this( null );
}

public DefaultTypeManager( final DefaultTypeManager parent )
private DefaultTypeManager( final DefaultTypeManager parent )
{
m_parent = parent;
if( m_parent != null )
@@ -79,7 +79,7 @@ public class DefaultTypeManager
return new DefaultTypeManager( this );
}

protected final MultiSourceTypeFactory lookupFactory( final String roleName )
private final MultiSourceTypeFactory lookupFactory( final String roleName )
{
return (MultiSourceTypeFactory)m_roleMap.get( roleName );
}


+ 2
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java View File

@@ -111,12 +111,12 @@ public class MultiSourceTypeFactory
*
* @return the type class
*/
protected final Class getType()
private final Class getType()
{
return m_type;
}

protected final TypeFactory getTypeFactory( final String name )
private final TypeFactory getTypeFactory( final String name )
{
return (TypeFactory)m_factories.get( name );
}


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java View File

@@ -391,7 +391,7 @@ public class DefaultTaskContext
* @param value the value of proeprty
* @exception TaskException if an error occurs
*/
protected void checkPropertyValid( final String name, final Object value )
private void checkPropertyValid( final String name, final Object value )
throws TaskException
{
if( BASE_DIRECTORY.equals( name ) && !( value instanceof File ) )


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java View File

@@ -26,7 +26,7 @@ import org.apache.myrmidon.api.TaskContext;
public class AndCondition
implements Condition
{
final ArrayList m_conditions = new ArrayList();
private final ArrayList m_conditions = new ArrayList();

/**
* Adds a condition.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java View File

@@ -26,7 +26,7 @@ import org.apache.myrmidon.api.TaskContext;
public class OrCondition
implements Condition
{
final ArrayList m_conditions = new ArrayList();
private final ArrayList m_conditions = new ArrayList();

/**
* Adds a condition.


+ 1
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java View File

@@ -31,6 +31,6 @@ public interface AspectManager
void addAspectHandler( String name, AspectHandler handler )
throws TaskException;

void removeAspectHandler( String name, AspectHandler handler )
void removeAspectHandler( String name )
throws TaskException;
}

Loading…
Cancel
Save