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

eclipse plugin: Fix the hyperlink helper: previous...

Browse source 
...code didn't take in account that previousSibling returns the AST's
previous node .
This commit is contained in:
Timotei Dolean 2011-07-16 20:58:05 +00:00
parent 1fcf75d7fb
commit b044e12ce3
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/navigation/WMLHyperlinkHelper.java
View file

@ -36,11 +36,9 @@ public class WMLHyperlinkHelper extends HyperlinkHelper
EObject object = WMLUtil.EObjectUtils( ).resolveElementAt( resource, offset );
if ( object == null || object instanceof WMLMacroCall == false )
if ( object == null )
return;
WMLMacroCall macroCall = ( WMLMacroCall ) object;
IFile file = WMLUtil.getActiveEditorFile();
if ( file == null ){
Logger.getInstance().logError( "FATAL! file is null (and it shouldn't) ");
@ -49,23 +47,28 @@ public class WMLHyperlinkHelper extends HyperlinkHelper
Paths paths = Preferences.getPaths( WesnothInstallsUtils.getInstallNameForResource( file ) );
ICompositeNode node = NodeModelUtils.getNode( macroCall );
ICompositeNode node = NodeModelUtils.getNode( object );
createMapHyperlink( paths, macroCall, acceptor, node );
createMacroHyperlink( paths, file, macroCall, acceptor, node );
createMapHyperlink( paths, object, acceptor, node );
createMacroHyperlink( paths, file, object, acceptor, node );
}
/**
* Creates a hyperlink for opening the macro definition
* @param paths The paths variable for the current install
* @param file The current edited file
* @param macro The macro object
* @param object The current object
* @param acceptor The hyperlink acceptor
* @param node The node model representation of the macro
*/
private void createMacroHyperlink( Paths paths, IFile file, WMLMacroCall macro,
private void createMacroHyperlink( Paths paths, IFile file, EObject object,
IHyperlinkAcceptor acceptor, ICompositeNode node )
{
if ( object instanceof WMLMacroCall == false )
return;
WMLMacroCall macro = ( WMLMacroCall ) object;
// get the define for the macro
Define define = ProjectUtils.getCacheForProject(
file.getProject() ).getDefines().get( macro.getName() );
@ -93,14 +96,20 @@ public class WMLHyperlinkHelper extends HyperlinkHelper
/**
* Creates a hyperlink for opening the map ( if applying )
* @param paths The paths variable for the current install
* @param macro The macro object
* @param object The current object
* @param acceptor The hyperlink acceptor
* @param node The node model representation of the macro
*/
private void createMapHyperlink( Paths paths, WMLMacroCall macro,
private void createMapHyperlink( Paths paths, EObject object,
IHyperlinkAcceptor acceptor, ICompositeNode node )
{
INode previousNode = node.getPreviousSibling( );
INode equalNode = node.getPreviousSibling( );
if ( equalNode == null ||
!( "=".equals( equalNode.getText( ) ) ) )
return;
INode previousNode = equalNode.getPreviousSibling( );
if ( previousNode == null ||
! ( "map_data".equals( previousNode.getText( ) ) ) )
return;