[jboss-svn-commits] JBL Code SVN: r32356 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: packages and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 1 13:59:12 EDT 2010
Author: baunax
Date: 2010-04-01 13:59:11 -0400 (Thu, 01 Apr 2010)
New Revision: 32356
Added:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/SetFactTypeFilter.java
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
Log:
Don't deleted anymore from the SuggestionCompletionEngine the facts filtered by the WorkingSet.
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/SetFactTypeFilter.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/SetFactTypeFilter.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/SetFactTypeFilter.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -0,0 +1,27 @@
+/**
+ *
+ */
+package org.drools.guvnor.client.modeldriven;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.drools.guvnor.client.modeldriven.FactTypeFilter;
+
+public class SetFactTypeFilter implements FactTypeFilter {
+
+ private static final long serialVersionUID = 501L;
+ private final Set<String> validFacts;
+
+ public SetFactTypeFilter() {
+ validFacts = Collections.emptySet();
+ }
+
+ public SetFactTypeFilter(Set<String> validFacts) {
+ this.validFacts = validFacts;
+ }
+
+ public boolean filter(String originalFact) {
+ return !validFacts.contains(originalFact);
+ }
+}
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/SetFactTypeFilter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2010-04-01 17:56:13 UTC (rev 32355)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -23,14 +23,14 @@
import org.drools.guvnor.client.common.ErrorPopup;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
+import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.modeldriven.FactTypeFilter;
import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
-import org.drools.guvnor.client.messages.Constants;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
-import com.google.gwt.core.client.GWT;
import com.gwtext.client.util.Format;
-import org.drools.guvnor.client.modeldriven.FactTypeFilter;
/**
* This utility cache will maintain a cache of suggestion completion engines,
@@ -111,9 +111,14 @@
* Removed the package from the cache, causing it to be loaded the next time.
*/
public void refreshPackage(String packageName, Command done) {
- if (cache.containsKey( packageName )) {
- cache.remove( packageName );
- loadPackage( packageName, done );
+ SuggestionCompletionEngine sce = cache.get(packageName);
+ if (sce != null) {
+ sce.setFactTypeFilter(null);
+ if (done != null) {
+ done.execute();
+ }
+// cache.remove( packageName );
+// loadPackage( packageName, done );
} else {
done.execute();
}
@@ -125,12 +130,12 @@
* @param filter the filter.
* @param done the command to be executed after the filter is applied.
*/
- public void applyFactFilter(final String packageName,final FactTypeFilter filter, final Command done){
- this.refreshPackage(packageName, new Command() {
- public void execute() {
- getEngineFromCache(packageName).filterFactTypes(filter);
- done.execute();
- }
- });
- }
+ public void applyFactFilter(final String packageName, final FactTypeFilter filter, final Command done) {
+ this.refreshPackage(packageName, new Command() {
+ public void execute() {
+ getEngineFromCache(packageName).setFactTypeFilter(filter);
+ done.execute();
+ }
+ });
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java 2010-04-01 17:56:13 UTC (rev 32355)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -9,7 +9,7 @@
import org.drools.factconstraints.client.ConstraintConfiguration;
import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.modeldriven.FactTypeFilter;
+import org.drools.guvnor.client.modeldriven.SetFactTypeFilter;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.WorkingSetConfigData;
@@ -22,13 +22,10 @@
*/
public class WorkingSetManager {
- private static WorkingSetManager INSTANCE = null;
- Map<String, Set<RuleAsset>> activeWorkingSets = new HashMap<String, Set<RuleAsset>>();
+ private static WorkingSetManager INSTANCE = new WorkingSetManager();
+ private Map<String, Set<RuleAsset>> activeWorkingSets = new HashMap<String, Set<RuleAsset>>();
public synchronized static WorkingSetManager getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new WorkingSetManager();
- }
return INSTANCE;
}
@@ -95,14 +92,8 @@
validFacts.addAll(Arrays.asList(wsConfig.validFacts));
}
- FactTypeFilter filter = new FactTypeFilter() {
-
- public boolean filter(String originalFact) {
- return !validFacts.contains(originalFact);
- }
- };
-
- SuggestionCompletionCache.getInstance().applyFactFilter(packageName, filter, cmd);
+ SuggestionCompletionCache.getInstance().applyFactFilter(packageName,
+ new SetFactTypeFilter(validFacts), cmd);
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-04-01 17:56:13 UTC (rev 32355)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -407,17 +407,6 @@
protected void showWorkingSetsSelection(RuleModeller modeller) {
final WorkingSetSelectorPopup pop = new WorkingSetSelectorPopup(modeller,asset);
-
-
- /*
- pop.setCommand( new Command() {
- public void execute() {
- checkinAction.doCheckin( pop.getCheckinComment() );
- if ( afterCheckinEvent != null ) afterCheckinEvent.execute();
- }
- } );
-
- */
pop.show();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-04-01 17:56:13 UTC (rev 32355)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetEditor.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -179,7 +179,7 @@
protected void removeConstraint() {
if (constraintsCombo.getSelectedIndex() != -1) {
ConstraintConfiguration c = contraintsMap.get(constraintsCombo.getValue(constraintsCombo.getSelectedIndex()));
- getConstraintsConstrainer().removeConstraint(c);
+ ((WorkingSetConfigData) workingSet.content).constraints = getConstraintsConstrainer().removeConstraint(c);
}
fillFieldConstrains();
}
@@ -300,96 +300,62 @@
Grid grid = new Grid(1, 3);
SuggestionCompletionEngine sce = SuggestionCompletionCache.getInstance().getEngineFromCache(workingSet.metaData.packageName);
+ boolean filteringFact = sce.isFilteringFacts();
+ sce.setFilteringFacts(false);
- Set<String> elem = new HashSet<String>();
+ try {
+ Set<String> elem = new HashSet<String>();
- availFacts.setVisibleItemCount(10);
- validFacts.setVisibleItemCount(10);
-
- if (wsData.validFacts != null) {
- elem.addAll(Arrays.asList(wsData.validFacts));
- for (String factName : wsData.validFacts) {
- validFacts.addItem(factName);
- }
- }
+ availFacts.setVisibleItemCount(10);
+ validFacts.setVisibleItemCount(10);
- for (String factName : sce.getFactTypes()) {
- if (!elem.contains(factName)) {
- availFacts.addItem(factName);
+ if (wsData.validFacts != null) {
+ elem.addAll(Arrays.asList(wsData.validFacts));
+ for (String factName : wsData.validFacts) {
+ validFacts.addItem(factName);
+ }
}
- }
-
- Grid btnsPanel = new Grid(2,1);
-
- btnsPanel.setWidget(0, 0, new Button(">", new ClickListener() {
- public void onClick(Widget sender) {
- copySelected(availFacts, validFacts);
- updateAsset(validFacts);
- fillSelectedFacts();
+
+ for (String factName : sce.getFactTypes()) {
+ if (!elem.contains(factName)) {
+ availFacts.addItem(factName);
+ }
}
- }));
+
+ Grid btnsPanel = new Grid(2,1);
+
+ btnsPanel.setWidget(0, 0, new Button(">", new ClickListener() {
+ public void onClick(Widget sender) {
+ copySelected(availFacts, validFacts);
+ updateAsset(validFacts);
+ fillSelectedFacts();
+ }
+ }));
- btnsPanel.setWidget(1, 0, new Button("<", new ClickListener() {
- public void onClick(Widget sender) {
- copySelected(validFacts, availFacts);
- updateAsset(validFacts);
- fillSelectedFacts();
- }
- }));
+ btnsPanel.setWidget(1, 0, new Button("<", new ClickListener() {
+ public void onClick(Widget sender) {
+ copySelected(validFacts, availFacts);
+ updateAsset(validFacts);
+ fillSelectedFacts();
+ }
+ }));
- grid.setWidget(0, 0, availFacts);
- grid.setWidget(0, 1, btnsPanel);
- grid.setWidget(0, 2, validFacts);
-
- grid.getColumnFormatter().setWidth(0, "45%");
- grid.getColumnFormatter().setWidth(0, "10%");
- grid.getColumnFormatter().setWidth(0, "45%");
- return grid;
+ grid.setWidget(0, 0, availFacts);
+ grid.setWidget(0, 1, btnsPanel);
+ grid.setWidget(0, 2, validFacts);
+
+ grid.getColumnFormatter().setWidth(0, "45%");
+ grid.getColumnFormatter().setWidth(0, "10%");
+ grid.getColumnFormatter().setWidth(0, "45%");
+ return grid;
+ } finally {
+ sce.setFilteringFacts(filteringFact);
+ }
}
/**
* This will get the save widgets.
*/
-// private Widget modifyWidgets() {
-//
-// HorizontalPanel horiz = new HorizontalPanel();
-//
-// Button copy = new Button(constants.Copy());
-// copy.addClickListener( new ClickListener() {
-// public void onClick(Widget w) {
-// showCopyDialog();
-// }
-// } );
-// horiz.add( copy );
-//
-// Button rename = new Button(constants.Rename());
-// rename.addClickListener( new ClickListener() {
-// public void onClick(Widget w) {
-// showRenameDialog();
-// }
-// } );
-// horiz.add( rename );
-//
-//
-// Button archive = new Button(constants.Archive());
-// archive.addClickListener(new ClickListener() {
-// public void onClick(Widget w) {
-// if ( Window.confirm(constants.AreYouSureYouWantToArchiveRemoveThisPackage()) ) {
-//// conf.archived = true;
-// Command ref = new Command() {
-// public void execute() {
-//// close.execute();
-//// refreshPackageList.execute();
-// }
-// };
-//// doSaveAction(ref);
-// }
-// }
-// });
-// horiz.add(archive);
-//
-// return horiz;
-// }
private void updateAsset(ListBox availFacts) {
List<String> l = new ArrayList<String>(availFacts.getItemCount());
@@ -408,65 +374,6 @@
}
}
- /**
- * Will show a copy dialog for copying the whole package.
- */
-// private void showCopyDialog() {
-// final FormStylePopup pop = new FormStylePopup("images/new_wiz.gif", constants.CopyTheWorkingSet()); // NON-NLS
-// pop.addRow(new HTML(constants.CopyTheWorkingSetTip()));
-// final TextBox name = new TextBox();
-// pop.addAttribute(constants.NewWorkingSetNameIs(), name);
-// Button ok = new Button(constants.OK());
-// pop.addAttribute("", ok);
-//
-// ok.addClickListener(new ClickListener() {
-// public void onClick(Widget w) {
-// if (!PackageNameValidator.validatePackageName(name.getText())) {
-// Window.alert(constants.NotAValidWorkingSetName());
-// return;
-// }
-// LoadingPopup.showMessage(constants.PleaseWaitDotDotDot());
-// RepositoryServiceFactory.getService().copyAsset(workingSet.uuid, workingSet.metaData.packageName, name.getText(),
-// new GenericCallback<String>() {
-// public void onSuccess(String uuid) {
-// //TODO {bauna} refreshPackageList.execute();
-// Window.alert(constants.WorkingSetCopiedSuccessfully());
-// pop.hide();
-// LoadingPopup.close();
-// }
-//
-// });
-// }
-// });
-//
-// pop.show();
-// }
-
-// private void showRenameDialog() {
-// final FormStylePopup pop = new FormStylePopup("images/new_wiz.gif", constants.RenameTheWorkingSet());
-// pop.addRow(new HTML(constants.RenameTheWorkingSetTip()));
-// final TextBox name = new TextBox();
-// pop.addAttribute(constants.NewWorkingSetNameIs(), name);
-// Button ok = new Button(constants.OK());
-// pop.addAttribute("", ok);
-//
-// ok.addClickListener(new ClickListener() {
-// public void onClick(Widget w) {
-// LoadingPopup.showMessage(constants.PleaseWaitDotDotDot());
-// RepositoryServiceFactory.getService().renameAsset(workingSet.uuid, name.getText(),
-// new GenericCallback<String>() {
-// public void onSuccess(String uuid) {
-// Window.alert(constants.WorkingSetRenamedSuccessfully());
-// pop.hide();
-// LoadingPopup.close();
-// }
-// });
-// }
-// });
-//
-// pop.show();
-// }
-
public SuggestionCompletionEngine getCompletionEngine() {
return sce;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java 2010-04-01 17:56:13 UTC (rev 32355)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java 2010-04-01 17:59:11 UTC (rev 32356)
@@ -61,18 +61,21 @@
treePanel.setRootVisible(false);
- RepositoryServiceFactory.getService().listAssets(asset.metaData.packageUUID, new String[]{AssetFormats.WORKING_SET}, 0, -1, "workingsetList", new GenericCallback<TableDataResult>() {
+ RepositoryServiceFactory.getService().listAssets(asset.metaData.packageUUID,
+ new String[] { AssetFormats.WORKING_SET }, 0, -1, "workingsetList",
+ new GenericCallback<TableDataResult>() {
- public void onSuccess(TableDataResult result) {
+ public void onSuccess(TableDataResult result) {
- for (int i = 0; i < result.data.length; i++) {
- TreeNode node = new TreeNode(result.data[i].getDisplayName());
- node.setUserObject(result.data[i].id);
- node.setChecked(WorkingSetManager.getInstance().isWorkingSetActive(asset.metaData.packageName, result.data[i].id));
- root.appendChild(node);
- }
- }
- });
+ for (int i = 0; i < result.data.length; i++) {
+ TreeNode node = new TreeNode(result.data[i].getDisplayName());
+ node.setUserObject(result.data[i].id);
+ node.setChecked(WorkingSetManager.getInstance().isWorkingSetActive(
+ asset.metaData.packageName, result.data[i].id));
+ root.appendChild(node);
+ }
+ }
+ });
save = new Button(constants.SaveAndClose());
save.addClickListener(new ClickListener() {
More information about the jboss-svn-commits
mailing list