You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2008/01/25 09:14:11 UTC
svn commit: r615142 - in
/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin:
Capability.java Category.java ExtractBindexInfo.java ObrUpdate.java
PElement.java PathFile.java Require.java ResourcesBundle.java
Author: mcculls
Date: Fri Jan 25 00:14:10 2008
New Revision: 615142
URL: http://svn.apache.org/viewvc?rev=615142&view=rev
Log:
Remove use of 'this.XYZ' in plugin code
Modified:
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Capability.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Category.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PElement.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PathFile.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Require.java
felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Capability.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Capability.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Capability.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Capability.java Fri Jan 25 00:14:10 2008
@@ -64,7 +64,7 @@
*/
public void setName( String name )
{
- this.m_name = name;
+ m_name = name;
}
@@ -87,7 +87,7 @@
*/
public void setP( List mp )
{
- this.m_p = mp;
+ m_p = mp;
}
@@ -112,10 +112,10 @@
public Node getNode( Document father )
{
Element capability = father.createElement( "capability" );
- capability.setAttribute( "name", this.getName() );
- for ( int i = 0; i < this.getP().size(); i++ )
+ capability.setAttribute( "name", getName() );
+ for ( int i = 0; i < getP().size(); i++ )
{
- capability.appendChild( ( ( PElement ) ( this.getP().get( i ) ) ).getNode( father ) );
+ capability.appendChild( ( ( PElement ) ( getP().get( i ) ) ).getNode( father ) );
}
return capability;
}
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Category.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Category.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Category.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Category.java Fri Jan 25 00:14:10 2008
@@ -55,7 +55,7 @@
*/
public void setId( String id )
{
- this.m_id = id;
+ m_id = id;
}
@@ -67,7 +67,7 @@
public Node getNode( Document father )
{
Element category = father.createElement( "category" );
- category.setAttribute( "id", this.getId() );
+ category.setAttribute( "id", getId() );
return category;
}
}
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java Fri Jan 25 00:14:10 2008
@@ -59,7 +59,7 @@
public ExtractBindexInfo( URI repoFilename, String outFile ) throws MojoExecutionException
{
- this.m_resource = null;
+ m_resource = null;
RepositoryImpl repository = null;
try
{
@@ -187,7 +187,7 @@
require.setMultiple( String.valueOf( ci.isMultiple() ) );
require.setOptional( String.valueOf( ci.isOptional() ) );
require.setName( ci.getName() );
- require.setFilter( this.parseFilter( ci.getFilter() ) );
+ require.setFilter( parseFilter( ci.getFilter() ) );
require.setValue( ci.getComment() );
list.add( require );
}
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java Fri Jan 25 00:14:10 2008
@@ -136,24 +136,24 @@
public ObrUpdate( PathFile repoFilename, String obrXml, MavenProject project, String outputFile, String localRepo,
Config userConfig, Log log )
{
- // this.m_localRepo = localRepo;
- this.m_outputFile = outputFile;
- this.m_repoFilename = repoFilename.getUri();
- this.m_obrXml = obrXml;
- this.m_project = project;
- this.m_logger = log;
+ // m_localRepo = localRepo;
+ m_outputFile = outputFile;
+ m_repoFilename = repoFilename.getUri();
+ m_obrXml = obrXml;
+ m_project = project;
+ m_logger = log;
- this.m_userConfig = userConfig;
+ m_userConfig = userConfig;
m_resourceBundle = new ResourcesBundle( log );
if ( userConfig.isRemotely() )
{
- this.m_repo = new PathFile( localRepo );
+ m_repo = new PathFile( localRepo );
}
else
{
- this.m_repo = repoFilename;
+ m_repo = repoFilename;
}
}
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PElement.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PElement.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PElement.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PElement.java Fri Jan 25 00:14:10 2008
@@ -63,7 +63,7 @@
*/
public void setN( String n )
{
- this.m_n = n;
+ m_n = n;
}
@@ -83,7 +83,7 @@
*/
public void setT( String t )
{
- this.m_t = t;
+ m_t = t;
}
@@ -103,7 +103,7 @@
*/
public void setV( String v )
{
- this.m_v = v;
+ m_v = v;
}
@@ -115,15 +115,15 @@
public Node getNode( Document father )
{
Element p = father.createElement( "p" );
- p.setAttribute( "n", this.getN() );
- if ( this.getT() != null )
+ p.setAttribute( "n", getN() );
+ if ( getT() != null )
{
- p.setAttribute( "t", this.getT() );
+ p.setAttribute( "t", getT() );
}
- if ( this.getV() != null )
+ if ( getV() != null )
{
- p.setAttribute( "v", this.getV() );
+ p.setAttribute( "v", getV() );
}
return p;
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PathFile.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PathFile.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PathFile.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/PathFile.java Fri Jan 25 00:14:10 2008
@@ -93,13 +93,13 @@
public PathFile( String filename )
{
- this.m_fullFilename = filename;
+ m_fullFilename = filename;
if ( filename == null )
{
- this.m_valid = false;
+ m_valid = false;
return;
}
- this.m_valid = true;
+ m_valid = true;
m_protocol = extractProtocol( filename );
m_pathFile = extractPathFile( filename );
if ( m_pathFile.startsWith( "//" ) )
@@ -141,7 +141,7 @@
}
// add the '/' before the complete path if it is absolute path
- if ( !this.isRelative() && !m_pathFile.startsWith( "/" ) )
+ if ( !isRelative() && !m_pathFile.startsWith( "/" ) )
{
m_pathFile = "/".concat( m_pathFile );
}
@@ -230,10 +230,10 @@
*/
public void setBaseDir( String baseDir )
{
- this.m_baseDir = baseDir;
- if ( isRelative() && this.m_fullFilename != null )
+ m_baseDir = baseDir;
+ if ( isRelative() && m_fullFilename != null )
{
- this.m_valid = true;
+ m_valid = true;
if ( getProtocol().compareTo( "file" ) == 0 || getProtocol().compareTo( "" ) == 0 )
{
File f = new File( getOnlyAbsoluteFilename() );
@@ -256,7 +256,7 @@
*/
public String getBaseDir()
{
- return this.m_baseDir;
+ return m_baseDir;
}
@@ -296,11 +296,11 @@
*/
public File getFile()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return null;
}
- String path = PathFile.uniformSeparator( this.getOnlyAbsoluteFilename() );
+ String path = PathFile.uniformSeparator( getOnlyAbsoluteFilename() );
if ( File.separatorChar == '\\' )
{
path = path.replace( '\\', '/' );
@@ -316,7 +316,7 @@
*/
public URI getUri()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return null;
}
@@ -349,7 +349,7 @@
*/
public String getRelativePath()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return null;
}
@@ -364,11 +364,11 @@
*/
public String getOnlyRelativePath()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return null;
}
- if ( this.isRelative() )
+ if ( isRelative() )
{
return m_pathFile;
@@ -446,7 +446,7 @@
*/
public String getOnlyAbsolutePath()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return null;
}
@@ -526,7 +526,7 @@
*/
public String getOnlyRelativeFilename()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return "";
}
@@ -542,12 +542,12 @@
*/
public String getRelativeFilename()
{
- if ( !this.isValid() )
+ if ( !isValid() )
{
return "";
}
- if ( this.isRelative() )
+ if ( isRelative() )
{
return getRelativePath() + getFilename();
}
@@ -576,7 +576,7 @@
*/
public boolean createPath()
{
- File path = new File( this.getOnlyAbsolutePath() );
+ File path = new File( getOnlyAbsolutePath() );
if ( path.exists() )
{
return true;
@@ -591,15 +591,15 @@
*/
public boolean createFile()
{
- File path = new File( this.getOnlyAbsolutePath() );
+ File path = new File( getOnlyAbsolutePath() );
if ( !path.exists() )
{
- if ( !this.createPath() )
+ if ( !createPath() )
{
return false;
}
}
- path = new File( this.getOnlyAbsoluteFilename() );
+ path = new File( getOnlyAbsoluteFilename() );
try
{
return path.createNewFile();
@@ -618,7 +618,7 @@
*/
public boolean delete()
{
- File path = new File( this.getAbsoluteFilename() );
+ File path = new File( getAbsoluteFilename() );
if ( path.exists() )
{
return path.delete();
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Require.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Require.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Require.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/Require.java Fri Jan 25 00:14:10 2008
@@ -78,7 +78,7 @@
*/
public void setExtend( String extend )
{
- this.m_extend = extend;
+ m_extend = extend;
}
@@ -98,7 +98,7 @@
*/
public void setFilter( String filter )
{
- this.m_filter = filter;
+ m_filter = filter;
}
@@ -118,7 +118,7 @@
*/
public void setMultiple( String multiple )
{
- this.m_multiple = multiple;
+ m_multiple = multiple;
}
@@ -138,7 +138,7 @@
*/
public void setName( String name )
{
- this.m_name = name;
+ m_name = name;
}
@@ -158,7 +158,7 @@
*/
public void setOptional( String optionnal )
{
- this.m_optional = optionnal;
+ m_optional = optionnal;
}
@@ -178,7 +178,7 @@
*/
public void setValue( String value )
{
- this.m_value = value;
+ m_value = value;
}
@@ -191,12 +191,12 @@
public Node getNode( Document father )
{
Element require = father.createElement( "require" );
- require.setAttribute( "name", this.getName() );
- require.setAttribute( "filter", this.getFilter() );
- require.setAttribute( "extend", this.getExtend() );
- require.setAttribute( "multiple", this.getMultiple() );
- require.setAttribute( "optional", this.getOptional() );
- XmlHelper.setTextContent( require, this.getValue() );
+ require.setAttribute( "name", getName() );
+ require.setAttribute( "filter", getFilter() );
+ require.setAttribute( "extend", getExtend() );
+ require.setAttribute( "multiple", getMultiple() );
+ require.setAttribute( "optional", getOptional() );
+ XmlHelper.setTextContent( require, getValue() );
return require;
}
Modified: felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java?rev=615142&r1=615141&r2=615142&view=diff
==============================================================================
--- felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java (original)
+++ felix/trunk/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java Fri Jan 25 00:14:10 2008
@@ -125,7 +125,7 @@
public void setCapability( List capability )
{
- this.m_capability = capability;
+ m_capability = capability;
}
@@ -137,7 +137,7 @@
public void setCategory( List category )
{
- this.m_category = category;
+ m_category = category;
}
@@ -149,7 +149,7 @@
public void setLicense( String license )
{
- this.m_license = license;
+ m_license = license;
}
@@ -161,7 +161,7 @@
public void setDescription( String description )
{
- this.m_description = description;
+ m_description = description;
}
@@ -173,7 +173,7 @@
public void setDocumentation( String documentation )
{
- this.m_documentation = documentation;
+ m_documentation = documentation;
}
@@ -197,7 +197,7 @@
public void setSize( String size )
{
- this.m_size = size;
+ m_size = size;
}
@@ -221,7 +221,7 @@
public void setUri( String url )
{
- this.m_uri = url;
+ m_uri = url;
}
@@ -233,7 +233,7 @@
public void setVersion( String version )
{
- this.m_version = version;
+ m_version = version;
}
@@ -245,7 +245,7 @@
public void setRequire( List require )
{
- this.m_require = require;
+ m_require = require;
}
@@ -257,7 +257,7 @@
public void setSource( String source )
{
- this.m_source = source;
+ m_source = source;
}
@@ -269,7 +269,7 @@
public void setId( String id )
{
- this.m_id = id;
+ m_id = id;
}
@@ -312,9 +312,9 @@
public Node getNode( Document father )
{
// return the complete resource tree
- if ( !this.isValid() || this.getId() == null )
+ if ( !isValid() || getId() == null )
{
- m_logger.error( "those properties was not defined:" + this.getInvalidProperties() );
+ m_logger.error( "those properties was not defined:" + getInvalidProperties() );
return null;
}
@@ -325,49 +325,49 @@
Element source = father.createElement( "source" );
Element license = father.createElement( "license" );
- resource.setAttribute( "id", this.getId() );
- resource.setAttribute( "symbolicname", this.getSymbolicName() );
- resource.setAttribute( "presentationname", this.getPresentationName() );
- resource.setAttribute( "uri", this.getUri() );
- resource.setAttribute( "version", this.getVersion() );
+ resource.setAttribute( "id", getId() );
+ resource.setAttribute( "symbolicname", getSymbolicName() );
+ resource.setAttribute( "presentationname", getPresentationName() );
+ resource.setAttribute( "uri", getUri() );
+ resource.setAttribute( "version", getVersion() );
- XmlHelper.setTextContent( description, this.getDescription() );
+ XmlHelper.setTextContent( description, getDescription() );
resource.appendChild( description );
- XmlHelper.setTextContent( size, this.getSize() );
+ XmlHelper.setTextContent( size, getSize() );
resource.appendChild( size );
- if ( this.getDocumentation() != null )
+ if ( getDocumentation() != null )
{
- XmlHelper.setTextContent( documentation, this.getDocumentation() );
+ XmlHelper.setTextContent( documentation, getDocumentation() );
resource.appendChild( documentation );
}
- if ( this.getSource() != null )
+ if ( getSource() != null )
{
- XmlHelper.setTextContent( source, this.getSource() );
+ XmlHelper.setTextContent( source, getSource() );
resource.appendChild( source );
}
- if ( this.getLicense() != null )
+ if ( getLicense() != null )
{
- XmlHelper.setTextContent( license, this.getLicense() );
+ XmlHelper.setTextContent( license, getLicense() );
resource.appendChild( license );
}
- List list = ( ArrayList ) this.getNodeCategories( father );
+ List list = ( ArrayList ) getNodeCategories( father );
for ( int i = 0; i < list.size(); i++ )
{
resource.appendChild( ( Node ) list.get( i ) );
}
- list = ( ArrayList ) this.getNodeCapabilities( father );
+ list = ( ArrayList ) getNodeCapabilities( father );
for ( int i = 0; i < list.size(); i++ )
{
resource.appendChild( ( Node ) list.get( i ) );
}
- list = ( ArrayList ) this.getNodeRequirement( father );
+ list = ( ArrayList ) getNodeRequirement( father );
for ( int i = 0; i < list.size(); i++ )
{
resource.appendChild( ( Node ) list.get( i ) );
@@ -388,7 +388,7 @@
if ( ebi.getPresentationName() != null )
{
- this.setPresentationName( ebi.getPresentationName() );
+ setPresentationName( ebi.getPresentationName() );
if ( project.getName() != null )
{
m_logger.debug( "pom property override:<presentationname> " + project.getName() );
@@ -396,12 +396,12 @@
}
else
{
- this.setPresentationName( project.getName() );
+ setPresentationName( project.getName() );
}
if ( ebi.getSymbolicName() != null )
{
- this.setSymbolicName( ebi.getSymbolicName() );
+ setSymbolicName( ebi.getSymbolicName() );
if ( project.getArtifactId() != null )
{
m_logger.debug( "pom property override:<symbolicname> " + project.getArtifactId() );
@@ -409,12 +409,12 @@
}
else
{
- this.setSymbolicName( project.getArtifactId() );
+ setSymbolicName( project.getArtifactId() );
}
if ( ebi.getVersion() != null )
{
- this.setVersion( ebi.getVersion() );
+ setVersion( ebi.getVersion() );
if ( project.getVersion() != null )
{
m_logger.debug( "pom property override:<version> " + project.getVersion() );
@@ -422,17 +422,17 @@
}
else
{
- this.setVersion( project.getVersion() );
+ setVersion( project.getVersion() );
}
if ( ebi.getId() != null )
{
- this.setId( ebi.getId() );
+ setId( ebi.getId() );
}
if ( ebi.getDescription() != null )
{
- this.setDescription( ebi.getDescription() );
+ setDescription( ebi.getDescription() );
if ( project.getDescription() != null )
{
m_logger.debug( "pom property override:<description> " + project.getDescription() );
@@ -440,12 +440,12 @@
}
else
{
- this.setDescription( project.getDescription() );
+ setDescription( project.getDescription() );
}
if ( ebi.getDocumentation() != null )
{
- this.setDocumentation( ebi.getDocumentation() );
+ setDocumentation( ebi.getDocumentation() );
if ( project.getUrl() != null )
{
m_logger.debug( "pom property override:<documentation> " + project.getUrl() );
@@ -453,12 +453,12 @@
}
else
{
- this.setDocumentation( project.getUrl() );
+ setDocumentation( project.getUrl() );
}
if ( ebi.getSource() != null )
{
- this.setSource( ebi.getSource() );
+ setSource( ebi.getSource() );
if ( project.getScm() != null )
{
m_logger.debug( "pom property override:<source> " + project.getScm() );
@@ -471,12 +471,12 @@
{
src = project.getScm().getUrl();
}
- this.setSource( src );
+ setSource( src );
}
if ( ebi.getLicense() != null )
{
- this.setLicense( ebi.getLicense() );
+ setLicense( ebi.getLicense() );
String lic = null;
List l = project.getLicenses();
Iterator it = l.iterator();
@@ -499,7 +499,7 @@
lic = it.next() + ";";
}
- this.setLicense( lic );
+ setLicense( lic );
}
// create the first capability (ie : bundle)
@@ -512,38 +512,38 @@
p = new PElement();
p.setN( "presentationname" );
- p.setV( this.getPresentationName() );
+ p.setV( getPresentationName() );
capability.addP( p );
p = new PElement();
p.setN( "symbolicname" );
- p.setV( this.getSymbolicName() );
+ p.setV( getSymbolicName() );
capability.addP( p );
p = new PElement();
p.setN( "version" );
p.setT( "version" );
- p.setV( this.getVersion() );
+ p.setV( getVersion() );
capability.addP( p );
- this.addCapability( capability );
+ addCapability( capability );
List capabilities = ( ArrayList ) ebi.getCapabilities();
for ( int i = 0; i < capabilities.size(); i++ )
{
- this.addCapability( ( Capability ) capabilities.get( i ) );
+ addCapability( ( Capability ) capabilities.get( i ) );
}
List requirement = ( ArrayList ) ebi.getRequirement();
for ( int i = 0; i < requirement.size(); i++ )
{
- this.addRequire( ( Require ) requirement.get( i ) );
+ addRequire( ( Require ) requirement.get( i ) );
}
// we also add the goupId
Category category = new Category();
category.setId( project.getGroupId() );
- this.addCategory( category );
+ addCategory( category );
return true;
}
@@ -556,8 +556,8 @@
public boolean isValid()
{
// we must verify required properties are present
- return this.getPresentationName() != null && this.getSymbolicName() != null && this.getVersion() != null
- && this.getUri() != null && this.getSize() != null;
+ return getPresentationName() != null && getSymbolicName() != null && getVersion() != null
+ && getUri() != null && getSize() != null;
}
@@ -570,10 +570,10 @@
*/
public boolean isSameBundleResource( String symbolicName, String version )
{
- if ( this.isValid() )
+ if ( isValid() )
{
- return ( symbolicName.compareTo( this.getSymbolicName() ) == 0 )
- && ( version.compareTo( this.getVersion() ) == 0 );
+ return ( symbolicName.compareTo( getSymbolicName() ) == 0 )
+ && ( version.compareTo( getVersion() ) == 0 );
}
else
{
@@ -591,7 +591,7 @@
private List getNodeCategories( Document father )
{
List listNode = new ArrayList();
- List listCategory = ( ArrayList ) this.getCategory();
+ List listCategory = ( ArrayList ) getCategory();
for ( int i = 0; i < listCategory.size(); i++ )
{
listNode.add( ( ( Category ) listCategory.get( i ) ).getNode( father ) );
@@ -608,7 +608,7 @@
private List getNodeCapabilities( Document father )
{
List listNode = new ArrayList();
- List listCapability = ( ArrayList ) this.getCapability();
+ List listCapability = ( ArrayList ) getCapability();
for ( int i = 0; i < listCapability.size(); i++ )
{
listNode.add( ( ( Capability ) listCapability.get( i ) ).getNode( father ) );
@@ -625,7 +625,7 @@
private List getNodeRequirement( Document father )
{
List listNode = new ArrayList();
- List listRequirement = ( ArrayList ) this.getRequire();
+ List listRequirement = ( ArrayList ) getRequire();
for ( int i = 0; i < listRequirement.size(); i++ )
{
listNode.add( ( ( Require ) listRequirement.get( i ) ).getNode( father ) );
@@ -640,9 +640,9 @@
*/
private String getInvalidProperties()
{
- if ( this.isValid() )
+ if ( isValid() )
{
- if ( this.getId() == null )
+ if ( getId() == null )
{
return "id";
}
@@ -652,23 +652,23 @@
}
}
String result = "";
- if ( this.getPresentationName() == null )
+ if ( getPresentationName() == null )
{
result = result + "presentationName;";
}
- if ( this.getSymbolicName() == null )
+ if ( getSymbolicName() == null )
{
result = result + "symbolicName;";
}
- if ( this.getVersion() == null )
+ if ( getVersion() == null )
{
result = result + "version;";
}
- if ( this.getUri() == null )
+ if ( getUri() == null )
{
result = result + "Uri;";
}
- if ( this.getSize() == null )
+ if ( getSize() == null )
{
result = result + "Size";
}