Author: timotei
Date: Wed Jul 6 18:54:22 2011
New Revision: 50189
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50189&view=rev
Log:
eclipse plugin: Tweak a bit the building reports
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java?rev=50189&r1=50188&r2=50189&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/DependencyTreeBuilder.java
Wed Jul 6 18:54:22 2011
@@ -80,12 +80,12 @@
}
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_ );
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java?rev=50189&r1=50188&r2=50189&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/builder/WesnothProjectBuilder.java
Wed Jul 6 18:54:22 2011
@@ -58,7 +58,7 @@
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 @@
monitor.worked(10);
}
monitor.done();
+
+ Logger.getInstance( ).log( "Done building project " +
getProject( ).getName( ) );
return null;
}
@@ -133,7 +135,7 @@
// 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 @@
try
{
IFile file = (IFile) resource;
-
-
monitor.subTask(String.format(Messages.WesnothProjectBuilder_19
,file.getName()));
+ String fileName = 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 @@
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 @@
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 );
}
}
}
Modified: trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties?rev=50189&r1=50188&r2=50189&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties
(original)
+++ trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/messages.properties Wed Jul
6 18:54:22 2011
@@ -218,8 +218,8 @@
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
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
