Author: timotei
Date: Tue Jul 26 17:32:12 2011
New Revision: 50428
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50428&view=rev
Log:
eclipse plugin: Add support for custom events
in the content assist
Modified:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/core/SimpleWMLParser.java
Modified:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java?rev=50428&r1=50427&r2=50428&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
Tue Jul 26 17:32:12 2011
@@ -222,7 +222,9 @@
if ( ( tagName.equals( "event" ) || tagName.equals(
"fire_event" ) )
&& keyName.equals( "name" ) ) {
// add events
- List<String> events = TemplateProvider.getInstance(
).getCAC( "events" );
+ List<String> events = new ArrayList<String>( );
+ events.addAll( TemplateProvider.getInstance( ).getCAC(
"events" ) );
+ events.addAll( projectCache_.getEvents( ) );
for ( String event : events ) {
acceptor.accept( createCompletionProposal( event,
context ) );
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java?rev=50428&r1=50427&r2=50428&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java
(original)
+++ trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/projects/ProjectCache.java
Tue Jul 26 17:32:12 2011
@@ -17,7 +17,9 @@
import java.io.Serializable;
import java.io.StreamCorruptedException;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.resources.IProject;
import org.wesnoth.Constants;
@@ -51,6 +53,7 @@
private Map< String, WMLConfig > configFiles_;
private DependencyListBuilder dependTree_;
private Map<String, WMLVariable> variables_;
+ private Set<String> events_;
public ProjectCache(IProject project)
{
@@ -60,6 +63,7 @@
defines_ = new HashMap<String, Define>( );
variables_ = new HashMap<String, WMLVariable>( );
properties_ = new HashMap<String, String>( );
+ events_ = new HashSet<String>( );
dependTree_ = new DependencyListBuilder( project_ );
@@ -211,6 +215,15 @@
}
/**
+ * Returns the list of events available in the project
+ * @return A set with events as strings
+ */
+ public Set<String> getEvents()
+ {
+ return events_;
+ }
+
+ /**
* The name of the install used in the project
*/
public String getInstallName()
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/core/SimpleWMLParser.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/core/SimpleWMLParser.java?rev=50428&r1=50427&r2=50428&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/core/SimpleWMLParser.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/wml/core/SimpleWMLParser.java
Tue Jul 26 17:32:12 2011
@@ -118,6 +118,7 @@
}
}
}
+ //TODO: parse custom events
System.out.println( "parsed config: " + config_ );
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
