0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: Tweak a bit the building reports

Browse source
This commit is contained in:
Timotei Dolean 2011-07-06 16:54:22 +00:00
parent eef9435c8a
commit b4a4957213
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java
View file

@ -80,13 +80,13 @@ public class DependencyTreeBuilder implements Serializable
}
isCreated_ = true;
currentIndex_ = 0;
parent_ = previous_ = null;
tree_.clear( );
// start creating the PDT (project dependency tree)
Queue<IContainer> containers = new LinkedBlockingDeque<IContainer>( );
parent_ = null;
tree_.clear( );
containers.add( project_ );
while( containers.isEmpty( ) == false ) {

17
utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
View file

@ -58,7 +58,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
if ( projectCache_ == null )
projectCache_ = ProjectUtils.getCacheForProject( getProject() );
Logger.getInstance().log("building..."); //$NON-NLS-1$
Logger.getInstance().log( "Building project " + getProject( ).getName( ) + " ..." ); //$NON-NLS-1$
monitor.beginTask(String.format(Messages.WesnothProjectBuilder_1, getProject().getName()), 100);
String installName = WesnothInstallsUtils.getInstallNameForResource( getProject() );
@ -104,6 +104,8 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
monitor.worked(10);
}
monitor.done();
Logger.getInstance( ).log( "Done building project " + getProject( ).getName( ) );
return null;
}
@ -133,7 +135,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
// going right the current branch
do {
// process the leaf
checkResource( node.getFile( ), monitor, false );
checkResource( leaf.getFile( ), monitor, false );
leaf = leaf.getNext( );
}while ( leaf != null );
@ -226,8 +228,9 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
try
{
IFile file = (IFile) resource;
String fileName = file.getName( );
monitor.subTask(String.format(Messages.WesnothProjectBuilder_19 ,file.getName()));
monitor.subTask( String.format( Messages.WesnothProjectBuilder_19 ,fileName ) );
List<String> defines = new ArrayList<String>();
// for non-main cfg file skip core as we already parsed
@ -240,7 +243,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
PreprocessorUtils.getInstance().getDefinesLocation(file), defines);
monitor.worked(5);
monitor.subTask(Messages.WesnothProjectBuilder_22);
monitor.subTask( String.format( Messages.WesnothProjectBuilder_22, fileName ) );
WMLSaxHandler handler = (WMLSaxHandler) ResourceUtils.
getWMLSAXHandlerFromResource(
@ -250,17 +253,17 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
if (handler != null)
{
ConfigFile cfg = handler.getConfigFile();
projectCache_.getConfigs().put(file.getName(), cfg);
projectCache_.getConfigs().put( fileName, cfg);
if (cfg.IsScenario)
{
if ( StringUtils.isNullOrEmpty( cfg.ScenarioId ) )
{
Logger.getInstance().log("added scenarioId [" + cfg.ScenarioId + //$NON-NLS-1$
"] for file: " + file.getName()); //$NON-NLS-1$
"] for file: " + fileName ); //$NON-NLS-1$
}
else
{
projectCache_.getConfigs().remove(file.getName());
projectCache_.getConfigs().remove( fileName );
}
}
}

4
utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties
View file

@ -218,8 +218,8 @@ WesnothPreferencesPage_8=This directory should containing data, manual, images d
WesnothPreferencesPage_9=User data directory*:
WesnothProjectBuilder_1=Building project %s ...
WesnothProjectBuilder_13=There was an error running the ant job.
WesnothProjectBuilder_19=Preprocessing file %s ...
WesnothProjectBuilder_22=Gathering file information...
WesnothProjectBuilder_19=File: %s - Preprocessing file ...
WesnothProjectBuilder_22=File: %s - Gathering file information...
WesnothProjectBuilder_3=Checking conditions...
WesnothProjectBuilder_6=Creating temporary directory...
WesnothProjectBuilder_7=Please set the wesnoth user dir before creating the content