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

eclipse plugin: use file project relative path...

Browse source 
...to index in the config instead of just the fileName
This commit is contained in:
Timotei Dolean 2011-07-13 20:45:54 +00:00
parent 9969a2c665
commit 0f352f62b1
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,7 +184,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
if ( deltaKind == IResourceDelta.REMOVED ) {
projectCache_.getDependencyList( ).removeNode( file );
projectCache_.getConfigs().remove( file.getName() );
projectCache_.getConfigs().remove( file.getProjectRelativePath( ).toString( ) );
} else if ( deltaKind == IResourceDelta.ADDED ){
DependencyListNode newNode = list.addNode( file );
if ( newNode == null )
@ -281,14 +281,14 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
!isResourceIgnored( resource ) )
{
IFile file = (IFile) resource;
String fileName = file.getName( );
String filePath = file.getProjectRelativePath( ).toString( );
String macrosFilePath = PreprocessorUtils.getInstance( ).getDefinesLocation( file );
Logger.getInstance().log( "Resource: " + fileName ); //$NON-NLS-1$
Logger.getInstance().log( "Resource: " + filePath ); //$NON-NLS-1$
try
{
monitor.subTask( String.format( Messages.WesnothProjectBuilder_19 ,fileName ) );
monitor.subTask( String.format( Messages.WesnothProjectBuilder_19 ,filePath ) );
List<String> defines = new ArrayList<String>();
// parse the core only if we don't have any macros file
@ -299,7 +299,7 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
PreprocessorUtils.getInstance().preprocessFile(file, macrosFilePath, defines);
monitor.worked(5);
monitor.subTask( String.format( Messages.WesnothProjectBuilder_22, fileName ) );
monitor.subTask( String.format( Messages.WesnothProjectBuilder_22, filePath ) );
WMLSaxHandler handler = (WMLSaxHandler) ResourceUtils.
getWMLSAXHandlerFromResource(
@ -309,17 +309,17 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
if (handler != null)
{
ConfigFile cfg = handler.getConfigFile();
projectCache_.getConfigs().put( fileName, cfg);
projectCache_.getConfigs().put( file.getProjectRelativePath( ).toString( ), cfg);
if (cfg.IsScenario)
{
if ( StringUtils.isNullOrEmpty( cfg.ScenarioId ) )
{
Logger.getInstance().log("added scenarioId [" + cfg.ScenarioId + //$NON-NLS-1$
"] for file: " + fileName ); //$NON-NLS-1$
"] for file: " + filePath ); //$NON-NLS-1$
}
else
{
projectCache_.getConfigs().remove( fileName );
projectCache_.getConfigs().remove( filePath );
}
}
}

1
utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java
View file

@ -156,7 +156,6 @@ public class ProjectCache
return properties_;
}
//TODO: memorize the full project-relative path for the config file!
/**
* Gets the map with the Configs
* The key represent the filenames of the files

2
utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/GameUtils.java
View file

@ -75,7 +75,7 @@ public class GameUtils
if (scenario == true && selectedResource instanceof IFile)
scenarioId = ProjectUtils.getCacheForProject(selectedResource.getProject()).
getConfig(selectedResource.getName()).ScenarioId;
getConfig(selectedResource.getProjectRelativePath( ).toString( )).ScenarioId;
if (campaignId == null)
{