donaldp 01/12/22 04:35:37
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/framework
TypeInstanceTask.java Pattern.java Os.java
DataType.java Condition.java AbstractTypeDef.java
AbstractContainerTask.java
Log:
Restyled.
Revision Changes Path
1.6 +8 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
Index: TypeInstanceTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TypeInstanceTask.java 2001/11/19 12:37:27 1.5
+++ TypeInstanceTask.java 2001/12/22 12:35:37 1.6
@@ -11,7 +11,6 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -34,10 +33,10 @@
private static final Resources REZ =
ResourceManager.getPackageResources( TypeInstanceTask.class );
- private String m_id;
- private Object m_value;
- private boolean m_localScope = true;
- private TypeFactory m_factory;
+ private String m_id;
+ private Object m_value;
+ private boolean m_localScope = true;
+ private TypeFactory m_factory;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -45,7 +44,10 @@
super.compose( componentManager );
final TypeManager typeManager =
(TypeManager)componentManager.lookup( TypeManager.ROLE );
- try { m_factory = typeManager.getFactory( DataType.ROLE ); }
+ try
+ {
+ m_factory = typeManager.getFactory( DataType.ROLE );
+ }
catch( final TypeException te )
{
final String message = REZ.getString( "type.no-factory.error" );
1.8 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Pattern.java 2001/11/19 12:37:27 1.7
+++ Pattern.java 2001/12/22 12:35:37 1.8
@@ -22,8 +22,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Pattern.class );
- private String m_value;
- private Condition m_condition;
+ private String m_value;
+ private Condition m_condition;
/**
* Retrieve value of pattern.
1.2 +70 -49
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Os.java
Index: Os.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Os.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Os.java 2001/12/16 12:10:29 1.1
+++ Os.java 2001/12/22 12:35:37 1.2
@@ -99,67 +99,88 @@
final String arch,
final String version )
{
- boolean retValue = false;
-
if( family != null || name != null || arch != null || version !=
null )
{
- boolean isFamily = true;
- boolean isName = true;
- boolean isArch = true;
- boolean isVersion = true;
+ final boolean isFamily = familyMatches( family );
+ final boolean isName = nameMatches( name );
+ final boolean isArch = archMatches( arch );
+ final boolean isVersion = versionMatches( version );
- if( family != null )
+ return isFamily && isName && isArch && isVersion;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private static boolean versionMatches( final String version )
+ {
+ boolean isVersion = true;
+ if( version != null )
+ {
+ isVersion = version.equals( m_osVersion );
+ }
+ return isVersion;
+ }
+
+ private static boolean archMatches( final String arch )
+ {
+ boolean isArch = true;
+ if( arch != null )
+ {
+ isArch = arch.equals( m_osArch );
+ }
+ return isArch;
+ }
+
+ private static boolean nameMatches( final String name )
+ {
+ boolean isName = true;
+ if( name != null )
+ {
+ isName = name.equals( m_osName );
+ }
+ return isName;
+ }
+
+ private static boolean familyMatches( final String family )
+ {
+ boolean isFamily = true;
+ if( family != null )
+ {
+ if( family.equals( "windows" ) )
{
- if( family.equals( "windows" ) )
- {
- isFamily = m_osName.indexOf( "windows" ) > -1;
- }
- else if( family.equals( "os/2" ) )
- {
- isFamily = m_osName.indexOf( "os/2" ) > -1;
- }
- else if( family.equals( "netware" ) )
- {
- isFamily = m_osName.indexOf( "netware" ) > -1;
- }
- else if( family.equals( "dos" ) )
- {
- isFamily = m_pathSep.equals( ";" ) && !isFamily(
"netware" );
- }
- else if( family.equals( "mac" ) )
- {
- isFamily = m_osName.indexOf( "mac" ) > -1;
- }
- else if( family.equals( "unix" ) )
- {
- isFamily = m_pathSep.equals( ":" ) &&
- ( !isFamily( "mac" ) || m_osName.endsWith( "x" ) );
- }
- else
- {
- final String message = REZ.getString(
"unknown-os-family", family );
- throw new IllegalArgumentException( message );
- }
+ isFamily = m_osName.indexOf( "windows" ) > -1;
}
-
- if( name != null )
+ else if( family.equals( "os/2" ) )
{
- isName = name.equals( m_osName );
+ isFamily = m_osName.indexOf( "os/2" ) > -1;
}
-
- if( arch != null )
+ else if( family.equals( "netware" ) )
{
- isArch = arch.equals( m_osArch );
+ isFamily = m_osName.indexOf( "netware" ) > -1;
}
-
- if( version != null )
+ else if( family.equals( "dos" ) )
{
- isVersion = version.equals( m_osVersion );
+ isFamily = m_pathSep.equals( ";" ) && !isFamily( "netware" );
}
-
- retValue = isFamily && isName && isArch && isVersion;
+ else if( family.equals( "mac" ) )
+ {
+ isFamily = m_osName.indexOf( "mac" ) > -1;
+ }
+ else if( family.equals( "unix" ) )
+ {
+ isFamily = m_pathSep.equals( ":" ) &&
+ ( !isFamily( "mac" ) || m_osName.endsWith( "x" ) );
+ }
+ else
+ {
+ final String message = REZ.getString( "unknown-os-family",
family );
+ throw new IllegalArgumentException( message );
+ }
}
- return retValue;
+ return isFamily;
}
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.java
Index: DataType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataType.java 2001/11/19 12:37:27 1.3
+++ DataType.java 2001/12/22 12:35:37 1.4
@@ -9,7 +9,7 @@
/**
* Base class for those classes that can appear inside the build file
- * as stand alone data types.
+ * as stand alone data types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
1.6 +2 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
Index: Condition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Condition.java 2001/11/19 12:37:26 1.5
+++ Condition.java 2001/12/22 12:35:37 1.6
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.myrmidon.api.TaskException;
/**
* Class representing a condition.
@@ -27,8 +26,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Condition.class );
- private String m_condition;
- private boolean m_isIfCondition;
+ private String m_condition;
+ private boolean m_isIfCondition;
public Condition( final boolean isIfCondition, final String condition )
{
1.9 +10 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
Index: AbstractTypeDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTypeDef.java 2001/11/19 12:37:26 1.8
+++ AbstractTypeDef.java 2001/12/22 12:35:37 1.9
@@ -36,11 +36,11 @@
private static final Resources REZ =
ResourceManager.getPackageResources( AbstractTypeDef.class );
- private File m_lib;
- private String m_name;
- private String m_className;
- private TypeManager m_typeManager;
- private RoleManager m_roleManager;
+ private File m_lib;
+ private String m_name;
+ private String m_className;
+ private TypeManager m_typeManager;
+ private RoleManager m_roleManager;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -86,7 +86,10 @@
final DefaultTypeFactory factory = new DefaultTypeFactory(
classLoader );
factory.addNameClassMapping( m_name, m_className );
- try { m_typeManager.registerType( role, m_name, factory ); }
+ try
+ {
+ m_typeManager.registerType( role, m_name, factory );
+ }
catch( final TypeException te )
{
final String message = REZ.getString(
"typedef.no-register.error" );
@@ -104,7 +107,7 @@
final ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
- return new URLClassLoader( new URL[] { url }, classLoader );
+ return new URLClassLoader( new URL[]{url}, classLoader );
}
catch( final Exception e )
{
1.7 +5 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
Index: AbstractContainerTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractContainerTask.java 2001/11/19 12:37:26 1.6
+++ AbstractContainerTask.java 2001/12/22 12:35:37 1.7
@@ -17,12 +17,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.converter.Converter;
+import org.apache.myrmidon.converter.ConverterException;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.converter.MasterConverter;
import org.apache.myrmidon.interfaces.executor.Executor;
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
/**
* This is the class that Task writers should extend to provide custom tasks.
@@ -37,13 +36,13 @@
ResourceManager.getPackageResources( AbstractContainerTask.class );
///For converting own attributes
- private MasterConverter m_converter;
+ private MasterConverter m_converter;
///For configuring own sub-elements
- private Configurer m_configurer;
+ private Configurer m_configurer;
///For executing sub-elements as tasks
- private Executor m_executor;
+ private Executor m_executor;
public void compose( final ComponentManager componentManager )
throws ComponentException
@@ -117,7 +116,6 @@
{
getConfigurer().configure( object, element, getContext() );
}
-
/**
* Configure an objects attribute using parameters.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
