[jboss-svn-commits] JBL Code SVN: r8489 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client/rpc client/rpc/mock client/ruleeditor public server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 21 07:13:19 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-21 07:13:12 -0500 (Thu, 21 Dec 2006)
New Revision: 8489
Removed:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/TextData.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.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:
half of CRUD now working
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2006-12-21 12:13:12 UTC (rev 8489)
@@ -17,14 +17,24 @@
* Can set it to DEBUG if you want to run it client side only.
*/
public static boolean DEBUG = true;
+ public static RepositoryServiceAsync SERVICE;
public static RepositoryServiceAsync getService() {
- if (DEBUG)
- return getMockService();
- return getRealService();
+ if (SERVICE == null) {
+ loadService();
+ }
+ return SERVICE;
}
+ private static void loadService() {
+ if (DEBUG)
+ SERVICE = getMockService();
+ else
+ SERVICE = getRealService();
+
+ }
+
private static RepositoryServiceAsync getMockService() {
return new MockRepositoryServiceAsync();
}
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/TextData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/TextData.java 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/TextData.java 2006-12-21 12:13:12 UTC (rev 8489)
@@ -1,12 +0,0 @@
-package org.drools.brms.client.rpc;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * This contains the payload for vanilla text of a rule.
- * Basically is a mutable string.
- */
-public class TextData implements IsSerializable {
- public String content;
- public boolean dirty;
-}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-21 12:13:12 UTC (rev 8489)
@@ -5,10 +5,10 @@
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryServiceAsync;
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.client.rpc.TableDataRow;
-import org.drools.brms.client.rpc.TextData;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -146,7 +146,7 @@
meta.createdDate = new Date();
if (uuid.endsWith( "1" )) {
meta.format = "DRL";
- TextData text = new TextData();
+ RuleContentText text = new RuleContentText();
asset.content = text;
text.content = "rule la\n\twhen\n\t\tSomething() ...";
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java 2006-12-21 12:13:12 UTC (rev 8489)
@@ -2,7 +2,7 @@
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rpc.TextData;
+import org.drools.brms.client.rpc.RuleContentText;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.Composite;
@@ -17,13 +17,13 @@
public class DefaultRuleContentWidget extends Composite {
private TextArea text;
- final private TextData data;
+ final private RuleContentText data;
final private MetaData meta;
final private RuleAsset asset;
public DefaultRuleContentWidget(RuleAsset a) {
asset = a;
- data = (TextData) asset.content;
+ data = (RuleContentText) asset.content;
meta = asset.metaData;
text = new TextArea();
@@ -35,7 +35,6 @@
text.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
data.content = text.getText();
- data.dirty = true;
meta.dirty = true;
}
});
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 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css 2006-12-21 12:13:12 UTC (rev 8489)
@@ -306,7 +306,7 @@
}
.loading-Popup {
- background-color: #CC6666;
+ background-color: #CCFFCC;
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 2006-12-21 12:07:36 UTC (rev 8488)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-21 12:13:12 UTC (rev 8489)
@@ -13,6 +13,7 @@
import javax.jcr.Session;
import javax.servlet.http.HttpSession;
+import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
@@ -209,10 +210,8 @@
asset.metaData = popuplateMetaData( item );
- //TODO: this could be refactored to there are different loadXXX methods, or
- //use polymorphism or something, in any case avoiding this dirty if statement...
- //as we know at the "client" what we should be loaded from the format string.
- if (item.getFormat().equals( "DSL" )) {
+ //TODO: possibly move this to a different structure, perhaps even into the drools-repository itself.
+ if (item.getFormat().equals( AssetFormats.DSL_TEMPLATE_RULE)) {
//ok here is where we do DSLs...
throw new SerializableException("Can't load DSL rules just yet.");
More information about the jboss-svn-commits
mailing list