[jboss-svn-commits] JBL Code SVN: r8612 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client client/common client/ruleeditor public server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 2 10:19:20 EST 2007
Author: michael.neale at jboss.com
Date: 2007-01-02 10:19:05 -0500 (Tue, 02 Jan 2007)
New Revision: 8612
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Admin.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
Log:
JBRULES-597 And some major refactoring.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Admin.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Admin.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Admin.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -32,9 +32,6 @@
return new Admin();
}
- public Image getImage() {
- return new Image("images/config.png");
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -30,9 +30,6 @@
return new Deployment();
}
- public Image getImage() {
- return new Image("images/deploy.gif");
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -31,9 +31,6 @@
return new Info();
}
- public Image getImage() {
- return new Image("images/drools.gif");
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeature.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeature.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -37,8 +37,6 @@
description = desc;
}
- public abstract Image getImage();
-
public abstract JBRMSFeature createInstance();
public String getDescription() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -18,21 +18,11 @@
public static void configure(JBRMSFeatureList list) {
list.addSink(Info.init());
list.addSink(RulesFeature.init());
-// list.addSink(Buttons.init());
-// list.addSink(Menus.init());
-// list.addSink(Images.init());
-// list.addSink(Layouts.init());
-// list.addSink(Lists.init());
list.addSink(Packages.init());
-// list.addSink(Tables.init());
list.addSink(RuleBases.init());
list.addSink(Deployment.init());
list.addSink(Admin.init());
list.addSink(Search.init());
-
-
-// list.addSink(Frames.init());
-// list.addSink(Tabs.init());
}
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -21,6 +21,8 @@
import org.drools.brms.client.JBRMSFeature.ComponentInfo;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -47,19 +49,8 @@
String name = info.getName();
Hyperlink link = new Hyperlink(name, name);
link.setStyleName("ks-SinkItem");
-
- Widget w = link;
-//this puts little icons next to the left hand labels
-// if (info.getImage() != null) {
-// HorizontalPanel panel = new HorizontalPanel();
-// panel.setStyleName("ks-SinkItem");
-// panel.add(info.getImage());
-// panel.add(link);
-// w = panel;
-// }
- //list.add(link);
- list.add(w);
+ list.add(link);
sinks.add(info);
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -33,9 +33,6 @@
return new Packages();
}
- public Image getImage() {
- return new Image( "images/package.gif" );
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -33,9 +33,6 @@
return new RuleBases();
}
- public Image getImage() {
- return new Image("images/config.png");
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -1,8 +1,12 @@
package org.drools.brms.client;
+import java.util.HashMap;
+import java.util.Map;
+
import org.drools.brms.client.categorynav.CategoryExplorerWidget;
import org.drools.brms.client.categorynav.CategorySelectHandler;
import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.LoadingPopup;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.ruleeditor.NewRuleWizard;
@@ -28,20 +32,20 @@
public class RulesFeature extends JBRMSFeature {
public static final int EDITOR_TAB = 1;
+ private TabPanel tab;
+ private Map openedViewers = new HashMap();
+
public static ComponentInfo init() {
return new ComponentInfo("Rules", "Find and edit rules.") {
public JBRMSFeature createInstance() {
return new RulesFeature();
}
- public Image getImage() {
- return new Image("images/rules.gif");
- }
};
}
- private TabPanel tab;
+
public RulesFeature() {
tab = new TabPanel();
@@ -49,11 +53,8 @@
tab.setHeight("100%");
FlexTable explorePanel = doExplore();
- //RuleView ruleViewer = doRuleViewer();
tab.add(explorePanel, "Explore");
- //tab.add(ruleViewer, "Author");
-
tab.selectTab(0);
initWidget(tab);
@@ -127,8 +128,19 @@
- public void showLoadEditor(String uuid) {
+ /**
+ * This will show the rule viewer. If it was previously opened, it will show that dialog instead
+ * of opening it again.
+ */
+ public void showLoadEditor(final String uuid) {
+
+ if (this.openedViewers.containsKey( uuid )) {
+ tab.selectTab( tab.getWidgetIndex( (Widget) this.openedViewers.get( uuid ) ));
+ LoadingPopup.close();
+ return;
+ }
+
RepositoryServiceFactory.getService().loadRuleAsset( uuid,
new AsyncCallback() {
public void onFailure(Throwable e) {
@@ -137,7 +149,7 @@
public void onSuccess(Object o) {
RuleAsset asset = (RuleAsset) o;
- RuleViewer view = new RuleViewer(asset);
+ final RuleViewer view = new RuleViewer(asset);
String displayName = asset.metaData.name;
if (displayName.length() > 10) {
@@ -145,15 +157,17 @@
}
tab.add( view, "<img src='images/rule_asset.gif'>" + displayName, true );
- final int i = tab.getWidgetIndex( view );
+ openedViewers.put(uuid, view);
+
view.setCloseCommand( new Command() {
public void execute() {
- tab.remove( i );
+ tab.remove( tab.getWidgetIndex( view ) );
tab.selectTab( 0 );
+ openedViewers.remove( uuid );
}
});
- tab.selectTab( i );
+ tab.selectTab( tab.getWidgetIndex( view ) );
}
} );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -30,10 +30,6 @@
return new Search();
}
- public Image getImage() {
-
- return new Image("images/drools.gif");
- }
};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStylePopup.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -15,7 +15,7 @@
private FormStyleLayout form;
-
+
public FormStylePopup(String image,
String title) {
super( true );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -9,12 +9,16 @@
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* This contains the widgets used to action a rule asset
@@ -23,7 +27,7 @@
*/
public class ActionToolbar extends Composite {
- private HorizontalPanel panel = new HorizontalPanel();
+ private FlexTable layout = new FlexTable();
private Command closeCommand;
private MetaData metaData;
@@ -42,13 +46,20 @@
this.checkin = checkin;
String status = metaData.state;
+ FlexCellFormatter formatter = layout.getFlexCellFormatter();
+ HorizontalPanel saveControls = new HorizontalPanel();
HTML state = new HTML("<b>Status: <i>[" + status + "]</i></b>");
- panel.add( state );
-
+ saveControls.add( state );
Image editState = new Image("images/edit.gif");
editState.setTitle( "Change state (NOT IMPLEMENTED YET)." );
- panel.add( editState );
+ saveControls.add( editState );
+
+ layout.setWidget( 0, 0, saveControls );
+ formatter.setAlignment( 0, 0, HasHorizontalAlignment.ALIGN_LEFT, HasVerticalAlignment.ALIGN_MIDDLE );
+
+
+
Image save = new Image("images/save_edit.gif");
save.setTitle( "Check in changes." );
save.addClickListener( new ClickListener() {
@@ -57,6 +68,21 @@
}
});
+ saveControls.add( save );
+
+ HorizontalPanel windowControls = new HorizontalPanel();
+
+ Image maxMinImage = new Image("images/max_min.gif");
+ maxMinImage.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ minimiseMaximise.execute();
+ }
+ });
+
+ windowControls.add( maxMinImage );
+
+
+
Image closeImg = new Image("images/close.gif");
closeImg.setTitle( "Close." );
closeImg.addClickListener( new ClickListener() {
@@ -70,19 +96,15 @@
}
});
- Image maxMinImage = new Image("images/max_min.gif");
- maxMinImage.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
- minimiseMaximise.execute();
- }
- });
+ windowControls.add( closeImg );
+ layout.setWidget( 0, 1, windowControls );
+ formatter.setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_MIDDLE );
+
- panel.add( save );
- panel.add( closeImg );
- panel.add( new HTML(" ") );
- panel.add( maxMinImage );
- initWidget( panel );
+
+ initWidget( layout );
+ setWidth( "100%" );
}
/**
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2007-01-02 15:19:05 UTC (rev 8612)
@@ -289,7 +289,7 @@
.warning-Popup {
border: 2px solid #B8B8B8;
- background-color: white;
+ background-color: #FDFCDC;
}
@@ -306,7 +306,7 @@
}
.loading-Popup {
- background-color: #CCFFCC;
+ background-color: #FDFCDC;
border: 1px solid #B8B8B8;
padding: 4px;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-01-02 14:58:35 UTC (rev 8611)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-01-02 15:19:05 UTC (rev 8612)
@@ -13,12 +13,14 @@
import javax.servlet.http.HttpSession;
import org.drools.brms.client.common.AssetFormats;
+import org.drools.brms.client.modeldriven.model.RuleModel;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.rpc.RuleContentText;
import org.drools.brms.client.rpc.TableConfig;
import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.server.util.BRLPersistence;
import org.drools.brms.server.util.MetaDataMapper;
import org.drools.brms.server.util.TableDisplayHandler;
import org.drools.repository.AssetItem;
@@ -215,9 +217,9 @@
//ok here is where we do DSLs...
throw new SerializableException("Can't load DSL rules just yet.");
- } else if (item.getFormat().equals( "DT" )) {
- //and here we do decision tables
- throw new SerializableException("Still working on this...");
+ } else if (item.getFormat().equals( AssetFormats.BUSINESS_RULE )) {
+ RuleModel model = BRLPersistence.getInstance().toModel( item.getContent() );
+ //asset.content = model;
} else {
//default to text, goode olde texte, just like mum used to make.
RuleContentText text = new RuleContentText();
More information about the jboss-svn-commits
mailing list