Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4584 - labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/outline
|
From: <jbo...@li...> - 2006-06-02 22:04:48
|
Author: KrisVerlaenen
Date: 2006-06-02 18:04:45 -0400 (Fri, 02 Jun 2006)
New Revision: 4584
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/outline/RuleContentOutlinePage.java
Log:
made outline view a lot less restrictive in finding patterns
+ made sure it only shows necessary info (no semicolon, doc, etc.)
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/outline/RuleContentOutlinePage.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/outline/RuleContentOutlinePage.java 2006-06-02 21:33:14 UTC (rev 4583)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/outline/RuleContentOutlinePage.java 2006-06-02 22:04:45 UTC (rev 4584)
@@ -38,26 +38,32 @@
///////////////////////////////////
// Patterns that the parser uses
///////////////////////////////////
- private static final Pattern rulePattern = Pattern.compile( "rule\\s+\"?([^\"]+)\"?.*",
+ private static final Pattern rulePattern1 = Pattern.compile( "\\s*rule\\s+\"([^\"]+)\".*",
Pattern.DOTALL );
- private static final Pattern packagePattern = Pattern.compile( "package\\s+([^\"]+)",
+ private static final Pattern rulePattern2 = Pattern.compile( "\\s*rule\\s+([^\\s;#\"]+).*",
Pattern.DOTALL );
- private static final Pattern functionNamePattern = Pattern.compile( "function\\s+(.*)\\s+(.*)\\(.*\\).*",
+ private static final Pattern packagePattern = Pattern.compile( "\\s*package\\s+([^\\s;#]+);?.*",
+ Pattern.DOTALL );
+
+ private static final Pattern functionNamePattern = Pattern.compile( "\\s*function\\s+(\\S+)\\s+(\\S+)\\(.*\\).*",
Pattern.DOTALL );
- private static final Pattern importNamePattern = Pattern.compile( "import\\s+([^\"]+)",
+ private static final Pattern importNamePattern = Pattern.compile( "\\s*import\\s+([^\\s;#]+);?.*",
Pattern.DOTALL );
- private static final Pattern expanderNamePattern = Pattern.compile( "expander\\s+([^\"]+);?",
- Pattern.DOTALL );
+ private static final Pattern expanderNamePattern = Pattern.compile( "\\s*expander\\s+([^\\s;#]+);?.*",
+ Pattern.DOTALL );
- private static final Pattern globalNamePattern = Pattern.compile( "global\\s+([^\"]+);?",
- Pattern.DOTALL );
+ private static final Pattern globalNamePattern = Pattern.compile( "\\s*global\\s+(\\S+)\\s+([^\\s;#]+);?.*",
+ Pattern.DOTALL );
- private static final Pattern queryNamePattern = Pattern.compile( "query\\s+\"?([^\"]+)\"?.*",
- Pattern.DOTALL );
+ private static final Pattern queryNamePattern1 = Pattern.compile( "\\s*query\\s+\"([^\"]+)\".*",
+ Pattern.DOTALL );
+
+ private static final Pattern queryNamePattern2 = Pattern.compile( "\\s*query\\s+([^\\s;#\"]+).*",
+ Pattern.DOTALL );
public RuleContentOutlinePage(DRLRuleEditor editor) {
super();
@@ -132,14 +138,20 @@
String st;
while ( (st = bufferedReader.readLine()) != null ) {
- Matcher matcher = rulePattern.matcher( st );
-
+ Matcher matcher = rulePattern1.matcher( st );
if ( matcher.matches() ) {
String rule = matcher.group( 1 );
packageTreeNode.addRule( rule,
offset,
st.length() );
}
+ matcher = rulePattern2.matcher( st );
+ if ( matcher.matches() ) {
+ String rule = matcher.group( 1 );
+ packageTreeNode.addRule( rule,
+ offset,
+ st.length() );
+ }
matcher = packagePattern.matcher( st );
if ( matcher.matches() ) {
String packageName = matcher.group( 1 );
@@ -149,7 +161,7 @@
}
matcher = functionNamePattern.matcher( st );
if ( matcher.matches() ) {
- String functionName = matcher.group( matcher.groupCount() );
+ String functionName = matcher.group( 2 );
packageTreeNode.addFunction( functionName + "()",
offset,
st.length() );
@@ -170,18 +182,27 @@
}
matcher = globalNamePattern.matcher( st );
if ( matcher.matches() ) {
- String globalName = matcher.group( 1 );
- packageTreeNode.addGlobal( globalName,
+ String globalType = matcher.group( 1 );
+ String globalName = matcher.group( 2 );
+ String name = globalName + " : " + globalType;
+ packageTreeNode.addGlobal( name,
offset,
st.length() );
}
- matcher = queryNamePattern.matcher( st );
+ matcher = queryNamePattern1.matcher( st );
if ( matcher.matches() ) {
String queryName = matcher.group( 1 );
packageTreeNode.addQuery( queryName,
offset,
st.length() );
}
+ matcher = queryNamePattern2.matcher( st );
+ if ( matcher.matches() ) {
+ String queryName = matcher.group( 1 );
+ packageTreeNode.addQuery( queryName,
+ offset,
+ st.length() );
+ }
offset += st.length() + System.getProperty("line.separator").length(); // + for the newline
}
|
