[jboss-svn-commits] JBL Code SVN: r35917 - labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/packages.

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

Author: tsurdilovic
Date: 2010-11-08 10:57:32 -0500 (Mon, 08 Nov 2010)
New Revision: 35917

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
Log:
BRMS-418 : Cannot switch to Basic view when a fact is declared in the Advanced view of the package configuration


Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java	2010-11-08 15:55:46 UTC (rev 35916)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java	2010-11-08 15:57:32 UTC (rev 35917)
@@ -24,6 +24,8 @@
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.common.InfoPopup;
+import org.drools.guvnor.client.packages.PackageHeaderHelper;
+import org.drools.guvnor.client.packages.PackageHeaderWidget.Types;
 import org.drools.guvnor.client.rpc.PackageConfigData;
 import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.messages.Constants;
@@ -190,21 +192,29 @@
         
         Button basicMode = new Button() {
             {
-                setText(constants.BasicView());
-                setTitle(constants.SwitchToGuidedModeEditing());
-                addClickListener(new ClickListener() {
+            	setText( constants.BasicView() );
+                setTitle( constants.SwitchToGuidedModeEditing() );
+                addClickListener( new ClickListener() {
                     public void onClick(Widget w) {
                         conf.header = area.getText();
-                		final Types t = PackageHeaderHelper.parseHeader(conf.header);
-                		if (t == null) {
-							Window.alert(constants.CanNotSwitchToBasicView());
-                		} else {
-                    		if (Window.confirm(constants.SwitchToGuidedModeForPackageEditing())) {             			
-                			    basicEditorVersion(t);
-                    		}
-                		}                		
+                        final Types t = PackageHeaderHelper.parseHeader( conf.header );
+                        if ( t == null ) {
+                        	Window.alert( constants.CanNotSwitchToBasicView() );
+                        } else {
+                        	if(t.hasDeclaredTypes) {
+                        		Window.alert( constants.CanNotSwitchToBasicViewDeclaredTypes() );
+                        	} else if (t.hasFunctions) {
+                        		Window.alert( constants.CanNotSwitchToBasicViewFunctions() );
+                        	} else if(t.hasRules) {
+                        		Window.alert( constants.CanNotSwitchToBasicViewRules() );
+                        	} else {
+                        		if ( Window.confirm( constants.SwitchToGuidedModeForPackageEditing() ) ) {
+                        			basicEditorVersion( t );
+                        		}
+                        	}
+                        }
                     }
-                });
+                } );
             }
         };
         main.add( basicMode );
@@ -300,6 +310,9 @@
 	static class Types {
 		List<Import> imports = new ArrayList<Import>();
 		List<Global> globals = new ArrayList<Global>();
+		boolean hasDeclaredTypes;
+        boolean hasFunctions;
+        boolean hasRules;
 	}
 
 	static class Import {