eclipse plugin: Fix the map opener hyperlink creator

code
This commit is contained in:
Timotei Dolean 2011-08-02 19:35:32 +00:00
parent d77c2ccae8
commit e612b974b7

View file

@ -8,15 +8,6 @@
*******************************************************************************/ *******************************************************************************/
package org.wesnoth.ui.navigation; package org.wesnoth.ui.navigation;
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.Region;
import org.eclipse.xtext.nodemodel.ICompositeNode;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper;
import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor;
import org.wesnoth.Logger; import org.wesnoth.Logger;
import org.wesnoth.installs.WesnothInstallsUtils; import org.wesnoth.installs.WesnothInstallsUtils;
import org.wesnoth.preferences.Preferences; import org.wesnoth.preferences.Preferences;
@ -25,8 +16,18 @@ import org.wesnoth.preprocessor.Define;
import org.wesnoth.projects.ProjectUtils; import org.wesnoth.projects.ProjectUtils;
import org.wesnoth.ui.editor.WMLEditor; import org.wesnoth.ui.editor.WMLEditor;
import org.wesnoth.utils.WMLUtils; import org.wesnoth.utils.WMLUtils;
import org.wesnoth.wml.WMLKey;
import org.wesnoth.wml.WMLMacroCall; import org.wesnoth.wml.WMLMacroCall;
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.Region;
import org.eclipse.xtext.nodemodel.ICompositeNode;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper;
import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor;
public class WMLHyperlinkHelper extends HyperlinkHelper public class WMLHyperlinkHelper extends HyperlinkHelper
{ {
@Override @Override
@ -104,15 +105,10 @@ public class WMLHyperlinkHelper extends HyperlinkHelper
private void createMapHyperlink( Paths paths, EObject object, private void createMapHyperlink( Paths paths, EObject object,
IHyperlinkAcceptor acceptor, ICompositeNode node ) IHyperlinkAcceptor acceptor, ICompositeNode node )
{ {
INode equalNode = node.getPreviousSibling( ); EObject container = object.eContainer( );
if ( equalNode == null || if ( !( container instanceof WMLKey ) ||
!( "=".equals( equalNode.getText( ) ) ) ) !( ( WMLKey ) container ).getName( ).equals( "map_data" ) )
return;
INode previousNode = equalNode.getPreviousSibling( );
if ( previousNode == null ||
! ( "map_data".equals( previousNode.getText( ) ) ) )
return; return;
String mapLocation = node.getText(); String mapLocation = node.getText();