[jboss-svn-commits] JBL Code SVN: r31903 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: packages and 1 other directory.

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

Author: jervisliu
Date: 2010-03-02 19:51:14 -0500 (Tue, 02 Mar 2010)
New Revision: 31903

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-446: in advanced edit mode, any leading word in statement other than 'global' or 'import' prevents mode to basic mode - no error raised

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-03-02 23:29:04 UTC (rev 31902)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-03-03 00:51:14 UTC (rev 31903)
@@ -2058,4 +2058,6 @@
     String Verify();  
     
     String VerificationReport();
+    
+    String CanNotSwitchToBasicView();
 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-03-02 23:29:04 UTC (rev 31902)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-03-03 00:51:14 UTC (rev 31903)
@@ -982,4 +982,5 @@
 ItemAlreadyInGlobalArea=The item is already in global area.
 VerifyingItemPleaseWait=Verifying item, please wait.
 Verify=Verify
-VerificationReport=Verification report
\ No newline at end of file
+VerificationReport=Verification report
+CanNotSwitchToBasicView=There are errors in this view. Can not switch to guided mode until the errors are resolved
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java	2010-03-02 23:29:04 UTC (rev 31902)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageHeaderWidget.java	2010-03-03 00:51:14 UTC (rev 31903)
@@ -33,8 +33,6 @@
  * @author Michael Neale
  */
 public class PackageHeaderWidget extends Composite {
-
-
 	private PackageConfigData conf;
 	private SimplePanel layout;
 	private ListBox importList;
@@ -47,17 +45,19 @@
 		layout = new SimplePanel();
 		render();
 
-
 		initWidget(layout);
 	}
 
-
 	private void render() {
-
 		final Types t = PackageHeaderHelper.parseHeader(conf.header);
 		if (t == null) {
 			textEditorVersion();
 		} else {
+			basicEditorVersion(t);
+		}
+	}
+			
+	private void basicEditorVersion(final Types t) {
 			layout.clear();
 			HorizontalPanel main = new HorizontalPanel();
 
@@ -149,13 +149,9 @@
 			};
 			main.add(advanced);
 
-
 			layout.add(main);
-
-		}
 	}
 
-
 	private void textEditorVersion() {
 		layout.clear();
 		
@@ -182,22 +178,25 @@
                 setTitle(constants.SwitchToGuidedModeEditing());
                 addClickListener(new ClickListener() {
                     public void onClick(Widget w) {
-                        if (Window.confirm(constants.SwitchToGuidedModeForPackageEditing())) {
-                            conf.header=area.getText();
-                            render();
-                        }
+                        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);
+                    		}
+                		}                		
                     }
                 });
             }
         };
         main.add( basicMode );
-
 		
 		layout.add(main);
 	}
 
 	private void showTypeQuestion(Widget w, final Types t, final boolean global, String headerMessage) {
-
 		final FormStylePopup pop = new FormStylePopup("images/home_icon.gif", constants.ChooseAFactType()); //NON-NLS
         pop.setWidth(-1);
 		pop.addRow(new HTML("<small><i>" + headerMessage + " </i></small>")); //NON-NLS
@@ -260,13 +259,8 @@
 		pop.addAttribute("", ok);
 
 		pop.show();
-
-
-
 	}
 
-
-
 	private void updateHeader(Types t) {
 		this.conf.header = PackageHeaderHelper.renderTypes(t);
 	}
@@ -279,7 +273,6 @@
 		}
 	}
 
-
 	private void doImports(Types t) {
 		importList.clear();
 		for (Iterator it = t.imports.iterator(); it.hasNext();) {
@@ -288,14 +281,6 @@
 		}
 	}
 
-
-
-
-
-
-
-
-
 	static class Types {
 		List imports = new ArrayList();
 		List globals = new ArrayList();