[jboss-svn-commits] JBL Code SVN: r34614 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse: wizard/dsl and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-08-09 19:27:59 -0400 (Mon, 09 Aug 2010)
New Revision: 34614

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java
Log:
JBDS-1261: Domain Specific Language Creation
 - added wizard page to select whether you want example content or not (default = false)
 - DSL editor now supports multi-line remove

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java	2010-08-09 23:27:29 UTC (rev 34613)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java	2010-08-09 23:27:59 UTC (rev 34614)
@@ -481,7 +481,9 @@
         add.addSelectionListener( new SelectionAdapter() {
             // Add a task to the ExampleTaskList and refresh the view
             public void widgetSelected(SelectionEvent e) {
-                model.removeEntry( getCurrentSelected() );
+            	for (DSLMappingEntry entry: getAllSelected()) {
+            		model.removeEntry( entry );
+            	}
                 refreshModel();
                 makeDirty();
                 exprText.setText( "" );
@@ -518,6 +520,14 @@
         return (DSLMappingEntry) ((IStructuredSelection) tableViewer.getSelection()).getFirstElement();
     }
 
+    private List<DSLMappingEntry> getAllSelected() {
+    	List<DSLMappingEntry> result = new ArrayList<DSLMappingEntry>();
+    	for (Object e: ((IStructuredSelection) tableViewer.getSelection()).toList()) {
+    		result.add((DSLMappingEntry) e); 
+    	}
+        return result;
+    }
+
     private void createAddButton(Composite parent) {
         // Create and configure the "Add" button
         Button add = new Button( parent,
@@ -610,7 +620,7 @@
      * Create the Table
      */
     private void createTable(Composite parent) {
-        int style = SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
+        int style = SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
 
         table = new Table( parent,
                            style );

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java	2010-08-09 23:27:29 UTC (rev 34613)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java	2010-08-09 23:27:59 UTC (rev 34614)
@@ -43,6 +43,7 @@
 public class NewDSLFilePage extends WizardNewFileCreationPage {
 
     private IWorkbench workbench;
+    private boolean exampleContent;
 
     public NewDSLFilePage(IWorkbench workbench, IStructuredSelection selection) {
         super("createDSLFilePage", selection);
@@ -56,7 +57,8 @@
         setPageComplete(true);
     }
 
-    public boolean finish() {
+    public boolean finish(boolean exampleContent) {
+    	this.exampleContent = exampleContent;
         String fileName = getFileName();
         if (!fileName.endsWith(".dsl")) {
             setFileName(fileName + ".dsl");
@@ -78,8 +80,12 @@
     
     protected InputStream getInitialContents() {
         try {
-            return DroolsEclipsePlugin.getDefault().getBundle().getResource(
-                "org/drools/eclipse/wizard/dsl/template.dsl").openStream();
+        	if (exampleContent) {
+        		return DroolsEclipsePlugin.getDefault().getBundle().getResource(
+                	"org/drools/eclipse/wizard/dsl/template.dsl").openStream();
+        	} else {
+        		return null;
+        	}
         } catch (IOException e) {
             return null;
         } catch (NullPointerException e) {

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java	2010-08-09 23:27:29 UTC (rev 34613)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFileWizard.java	2010-08-09 23:27:59 UTC (rev 34614)
@@ -34,6 +34,7 @@
     private IWorkbench workbench;
     private IStructuredSelection selection;
     private NewDSLFilePage mainPage;
+    private NewDSLFilePage2 extraPage;
     
     public void init(IWorkbench workbench, IStructuredSelection selection) {
         this.workbench = workbench;
@@ -46,10 +47,12 @@
     public void addPages() {
         mainPage = new NewDSLFilePage(workbench, selection);
         addPage(mainPage);
+        extraPage = new NewDSLFilePage2();
+        addPage(extraPage);
      }
 
     public boolean performFinish() {
-        return mainPage.finish();
+        return mainPage.finish(extraPage.isExampleContent());
     }