[jboss-svn-commits] JBL Code SVN: r34894 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/client/admin and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 26 07:42:55 EDT 2010
Author: Rikkola
Date: 2010-08-26 07:42:54 -0400 (Thu, 26 Aug 2010)
New Revision: 34894
Added:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/GlobalCollectionAddWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/PopupCreator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewSubPackageWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotDiffView.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
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/qa/AnalysisView.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExecutionWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.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/BPELWrapper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
Log:
GUVNOR-587 : Replace com.gwtext.client.util.Format
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/LoggedInUserInfo.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,20 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,12 +14,15 @@
* limitations under the License.
*/
+package org.drools.guvnor.client;
+
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.UserSecurityContext;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.Timer;
@@ -44,7 +30,6 @@
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
/**
* Simple widget to show who is logged in, and a link to logout.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +31,7 @@
import org.drools.guvnor.client.common.RulePackageSelector;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.Window;
@@ -66,125 +67,116 @@
import com.gwtext.client.widgets.grid.GridPanel;
import com.gwtext.client.widgets.grid.GroupingView;
import com.gwtext.client.widgets.grid.event.GridRowListenerAdapter;
-import com.gwtext.client.util.Format;
public class PermissionViewer extends Composite {
- private VerticalPanel layout;
- private GridPanel grid;
- private Constants constants = ((Constants) GWT.create(Constants.class));
+ private VerticalPanel layout;
+ private GridPanel grid;
+ private Constants constants = ((Constants) GWT.create( Constants.class ));
public PermissionViewer() {
- layout = new VerticalPanel();
- layout.setHeight("100%");
- layout.setWidth("100%");
+ layout = new VerticalPanel();
+ layout.setHeight( "100%" );
+ layout.setWidth( "100%" );
- layout.add(howToTurnOn());
+ layout.add( howToTurnOn() );
- refresh();
- initWidget(layout);
- }
+ refresh();
+ initWidget( layout );
+ }
- private Widget howToTurnOn() {
- HorizontalPanel hp = new HorizontalPanel();
- hp.add(new HTML("<small><i>" + constants.TipAuthEnable() + "</i></small>"));
- InfoPopup pop = new InfoPopup(constants.EnablingAuthorization(), constants.EnablingAuthPopupTip());
- hp.add(pop);
- return hp;
- }
+ private Widget howToTurnOn() {
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add( new HTML( "<small><i>" + constants.TipAuthEnable() + "</i></small>" ) );
+ InfoPopup pop = new InfoPopup( constants.EnablingAuthorization(),
+ constants.EnablingAuthPopupTip() );
+ hp.add( pop );
+ return hp;
+ }
- private void refresh() {
- LoadingPopup.showMessage(constants.LoadingUserPermissions());
- RepositoryServiceFactory.getService().listUserPermissions(new GenericCallback<Map<String,List<String>>>() {
- public void onSuccess(Map<String, List<String>> list) {
- if (grid != null) {
- layout.clear();
- //layout.remove(grid);
- grid.destroy();
- }
- showUsers(list);
- LoadingPopup.close();
- }
- });
- }
+ private void refresh() {
+ LoadingPopup.showMessage( constants.LoadingUserPermissions() );
+ RepositoryServiceFactory.getService().listUserPermissions( new GenericCallback<Map<String, List<String>>>() {
+ public void onSuccess(Map<String, List<String>> list) {
+ if ( grid != null ) {
+ layout.clear();
+ //layout.remove(grid);
+ grid.destroy();
+ }
+ showUsers( list );
+ LoadingPopup.close();
+ }
+ } );
+ }
- private void showUsers(Map<String,List<String>> users) {
+ private void showUsers(Map<String, List<String>> users) {
+ //showing a grid - the cols are:
+ //userName, hasAdmin, hasPackage, hasCategory permissions...
+ //double click to edit
+ Object[][] data = new Object[users.size()][4];
- //showing a grid - the cols are:
- //userName, hasAdmin, hasPackage, hasCategory permissions...
- //double click to edit
- Object[][] data = new Object[users.size()][4];
+ int row = 0;
+ for ( Map.Entry<String, List<String>> userRow : users.entrySet() ) {
+ data[row][0] = userRow.getKey();
+ List<String> permTypes = userRow.getValue();
+ data[row][1] = isAdmin( permTypes );
+ data[row][2] = isPackage( permTypes );
+ data[row][3] = isCategory( permTypes );
+ row++;
+ }
- int row = 0;
- for (Map.Entry<String, List<String>> userRow : users.entrySet()) {
- data[row][0] = userRow.getKey();
- List<String> permTypes = userRow.getValue();
- data[row][1] = isAdmin(permTypes);
- data[row][2] = isPackage(permTypes);
- data[row][3] = isCategory(permTypes);
+ MemoryProxy proxy = new MemoryProxy( data );
+ RecordDef recordDef = new RecordDef( new FieldDef[]{new StringFieldDef( "userName" ), //NON-NLS
+ new StringFieldDef( "isAdmin" ), //NON-NLS
+ new StringFieldDef( "isPackage" ), //NON-NLS
+ new StringFieldDef( "isCategory" ), //NON-NLS
+ } );
- row++;
- }
+ ArrayReader reader = new ArrayReader( recordDef );
+ GroupingStore store = new GroupingStore();
+ store.setReader( reader );
+ store.setDataProxy( proxy );
+ store.setGroupField( "isAdmin" ); //NON-NLS
+ store.setSortInfo( new SortState( "userName",
+ SortDir.ASC ) ); //NON-NLS
+ store.load();
+ ColumnModel cm = new ColumnModel( new ColumnConfig[]{new ColumnConfig() {
+ {
+ setDataIndex( "userName" ); //NON-NLS
+ setSortable( true );
+ setHeader( constants.UserName1() );
+ }
+ }, new ColumnConfig() {
+ {
+ setHeader( constants.Administrator() );
+ setSortable( true );
+ setDataIndex( "isAdmin" ); //NON-NLS
+ }
+ }, new ColumnConfig() {
+ {
+ setHeader( constants.HasPackagePermissions() );
+ setSortable( true );
+ setDataIndex( "isPackage" ); //NON-NLS
+ }
+ }, new ColumnConfig() {
+ {
+ setHeader( constants.HasCategoryPermissions() );
+ setSortable( true );
+ setDataIndex( "isCategory" ); //NON-NLS
+ }
+ }
- MemoryProxy proxy = new MemoryProxy(data);
- RecordDef recordDef = new RecordDef(
- new FieldDef[]{
- new StringFieldDef("userName"), //NON-NLS
- new StringFieldDef("isAdmin"), //NON-NLS
- new StringFieldDef("isPackage"), //NON-NLS
- new StringFieldDef("isCategory"), //NON-NLS
- }
- );
+ } );
- ArrayReader reader = new ArrayReader(recordDef);
- GroupingStore store = new GroupingStore();
- store.setReader(reader);
- store.setDataProxy(proxy);
- store.setGroupField("isAdmin"); //NON-NLS
- store.setSortInfo(new SortState("userName", SortDir.ASC)); //NON-NLS
- store.load();
+ grid = new GridPanel();
+ grid.setColumnModel( cm );
+ grid.setStore( store );
+ grid.setWidth( 550 );
+ grid.setHeight( 600 );
- ColumnModel cm = new ColumnModel(new ColumnConfig[] {
- new ColumnConfig() {
- {
- setDataIndex("userName"); //NON-NLS
- setSortable(true);
- setHeader(constants.UserName1());
- }
- },
- new ColumnConfig() {
- {
- setHeader(constants.Administrator());
- setSortable(true);
- setDataIndex("isAdmin"); //NON-NLS
- }
- },
- new ColumnConfig() {
- {
- setHeader(constants.HasPackagePermissions());
- setSortable(true);
- setDataIndex("isPackage"); //NON-NLS
- }
- },
- new ColumnConfig() {
- {
- setHeader(constants.HasCategoryPermissions());
- setSortable(true);
- setDataIndex("isCategory"); //NON-NLS
- }
- }
-
- });
-
- grid = new GridPanel();
- grid.setColumnModel(cm);
- grid.setStore(store);
- grid.setWidth(550);
- grid.setHeight(600);
-
/* MN Don't want grouping.
GroupingView gv = new GroupingView();
//to stretch it out
@@ -192,281 +184,314 @@
gv.setGroupTextTpl("{text} ({[values.rs.length]} {[values.rs.length > 1 ? \"Items\" : \"Item\"]})");
grid.setView(gv);
*/
- Toolbar tb = new Toolbar();
- grid.setTopToolbar(tb);
+ Toolbar tb = new Toolbar();
+ grid.setTopToolbar( tb );
- tb.addItem(new ToolbarTextItem(constants.CurrentlyConfiguredUsers()));
- tb.addItem(new ToolbarSeparator());
+ tb.addItem( new ToolbarTextItem( constants.CurrentlyConfiguredUsers() ) );
+ tb.addItem( new ToolbarSeparator() );
- layout.add(grid);
- ToolbarButton reload = new ToolbarButton(constants.Reload1());
- reload.addListener(new ButtonListenerAdapter() {
- public void onClick(Button button, EventObject e) {
- refresh();
- }
- });
- tb.addButton(reload);
+ layout.add( grid );
+ ToolbarButton reload = new ToolbarButton( constants.Reload1() );
+ reload.addListener( new ButtonListenerAdapter() {
+ public void onClick(Button button,
+ EventObject e) {
+ refresh();
+ }
+ } );
+ tb.addButton( reload );
+ grid.addGridRowListener( new GridRowListenerAdapter() {
+ @Override
+ public void onRowDblClick(GridPanel grid,
+ int rowIndex,
+ EventObject e) {
+ String userName = grid.getSelectionModel().getSelected().getAsString( "userName" ); //NON-NLS
+ showEditor( userName );
+ }
+ } );
- grid.addGridRowListener(new GridRowListenerAdapter() {
- @Override
- public void onRowDblClick(GridPanel grid, int rowIndex,
- EventObject e) {
- String userName = grid.getSelectionModel().getSelected().getAsString("userName"); //NON-NLS
- showEditor(userName);
- }
- });
+ ToolbarButton create = new ToolbarButton( constants.CreateNewUserMapping() );
+ create.addListener( new ButtonListenerAdapter() {
+ public void onClick(Button button,
+ EventObject e) {
+ final FormStylePopup form = new FormStylePopup( "images/snapshot.png", //NON-NLS
+ constants.EnterNewUserName() );
+ final TextBox userName = new TextBox();
+ form.addAttribute( constants.NewUserName(),
+ userName );
- ToolbarButton create = new ToolbarButton(constants.CreateNewUserMapping());
- create.addListener(new ButtonListenerAdapter() {
- public void onClick(Button button, EventObject e) {
- final FormStylePopup form = new FormStylePopup("images/snapshot.png", //NON-NLS
- constants.EnterNewUserName());
- final TextBox userName = new TextBox();
- form.addAttribute(constants.NewUserName(), userName);
+ com.google.gwt.user.client.ui.Button create = new com.google.gwt.user.client.ui.Button( constants.OK() );
+ form.addAttribute( "",
+ create );
+ create.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ if ( userName.getText() != null && userName.getText().length() != 0 ) {
+ RepositoryServiceFactory.getService().createUser( userName.getText(),
+ new GenericCallback() {
+ public void onSuccess(Object a) {
+ refresh();
+ showEditor( userName.getText() );
+ }
- com.google.gwt.user.client.ui.Button create = new com.google.gwt.user.client.ui.Button(constants.OK());
- form.addAttribute("", create);
- create.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- if (userName.getText() != null && userName.getText().length() !=0) {
- RepositoryServiceFactory.getService().createUser(userName.getText(), new GenericCallback() {
- public void onSuccess(Object a) {
- refresh();
- showEditor(userName.getText());
- }
- public void onFailure(Throwable t) {
- super.onFailure(t);
- }
- });
- form.hide();
- }
- }
- });
-
- form.show();
- }
+ public void onFailure(Throwable t) {
+ super.onFailure( t );
+ }
+ } );
+ form.hide();
+ }
+ }
+ } );
+ form.show();
+ }
- });
- tb.addButton(create);
+ } );
+ tb.addButton( create );
- ToolbarButton delete = new ToolbarButton(constants.DeleteSelectedUser());
- delete.addListener(new ButtonListenerAdapter() {
- public void onClick(Button button, EventObject e) {
- final String userName = grid.getSelectionModel().getSelected().getAsString("userName"); //NON-NLS
- if (userName != null && Window.confirm(Format.format(constants.AreYouSureYouWantToDeleteUser0(), userName))) {
- RepositoryServiceFactory.getService().deleteUser(userName, new GenericCallback() {
- public void onSuccess(Object a) {
- refresh();
- }
- });
- }
- }
- });
- tb.addButton(delete);
+ ToolbarButton delete = new ToolbarButton( constants.DeleteSelectedUser() );
+ delete.addListener( new ButtonListenerAdapter() {
+ public void onClick(Button button,
+ EventObject e) {
+ final String userName = grid.getSelectionModel().getSelected().getAsString( "userName" ); //NON-NLS
+ if ( userName != null && Window.confirm( Format.format( constants.AreYouSureYouWantToDeleteUser0(),
+ userName ) ) ) {
+ RepositoryServiceFactory.getService().deleteUser( userName,
+ new GenericCallback() {
+ public void onSuccess(Object a) {
+ refresh();
+ }
+ } );
+ }
+ }
+ } );
+ tb.addButton( delete );
+ }
+ private void showEditor(final String userName) {
+ LoadingPopup.showMessage( constants.LoadingUsersPermissions() );
+ RepositoryServiceFactory.getService().retrieveUserPermissions( userName,
+ new GenericCallback<Map<String, List<String>>>() {
+ public void onSuccess(final Map<String, List<String>> perms) {
+ FormStylePopup editor = new FormStylePopup( "images/managment.gif",
+ Format.format( constants.EditUser0(),
+ userName ) ); //NON-NLS
+ editor.addRow( new HTML( "<i>" + constants.UserAuthenticationTip() + "</i>" ) );
+ //now render the actual permissions...
+ VerticalPanel vp = new VerticalPanel();
+ editor.addAttribute( "",
+ doPermsPanel( perms,
+ vp ) );
+ com.google.gwt.user.client.ui.Button save = new com.google.gwt.user.client.ui.Button( constants.SaveChanges() );
+ editor.addAttribute( "",
+ save );
+ save.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ LoadingPopup.showMessage( constants.Updating() );
+ RepositoryServiceFactory.getService().updateUserPermissions( userName,
+ perms,
+ new GenericCallback() {
+ public void onSuccess(Object a) {
+ LoadingPopup.close();
+ refresh();
+ }
+ } );
+ }
+ } );
+ editor.show();
+ LoadingPopup.close();
+ }
+ } );
+ }
+ /**
+ * The permissions panel.
+ */
+ private Widget doPermsPanel(final Map<String, List<String>> perms,
+ final Panel vp) {
+ vp.clear();
- }
+ for ( Map.Entry<String, List<String>> perm : perms.entrySet() ) {
+ if ( perm.getKey().equals( "admin" ) ) { //NON-NLS
+ HorizontalPanel h = new HorizontalPanel();
+ h.add( new HTML( "<b>" + constants.ThisUserIsAnAdministrator() + "</b>" ) ); //NON-NLS
+ com.google.gwt.user.client.ui.Button del = new com.google.gwt.user.client.ui.Button( constants.RemoveAdminRights() );
+ del.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ if ( Window.confirm( constants.AreYouSureYouWantToRemoveAdministratorPermissions() ) ) {
+ perms.remove( "admin" ); //NON-NLS
+ doPermsPanel( perms,
+ vp );
+ }
+ }
+ } );
+ h.add( del );
+ vp.add( h );
+ } else {
+ final String permType = perm.getKey();
+ final List<String> permList = perm.getValue();
- private void showEditor(final String userName) {
- LoadingPopup.showMessage(constants.LoadingUsersPermissions());
- RepositoryServiceFactory.getService().retrieveUserPermissions(userName, new GenericCallback<Map<String, List<String>>>() {
- public void onSuccess(final Map<String, List<String>> perms) {
- FormStylePopup editor = new FormStylePopup("images/managment.gif", Format.format(constants.EditUser0(), userName)); //NON-NLS
- editor.addRow(new HTML("<i>" + constants.UserAuthenticationTip() + "</i>"));
- //now render the actual permissions...
- VerticalPanel vp = new VerticalPanel();
- editor.addAttribute("", doPermsPanel(perms, vp));
- com.google.gwt.user.client.ui.Button save = new com.google.gwt.user.client.ui.Button(constants.SaveChanges());
- editor.addAttribute("", save);
- save.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- LoadingPopup.showMessage(constants.Updating());
- RepositoryServiceFactory.getService().updateUserPermissions(userName, perms, new GenericCallback() {
- public void onSuccess(Object a) {
- LoadingPopup.close();
- refresh();
- }
- });
+ Grid g = new Grid( permList.size() + 1,
+ 3 );
+ g.setWidget( 0,
+ 0,
+ new HTML( "<b>[" + permType + "] for:</b>" ) ); //NON-NLS
- }
- });
+ for ( int i = 0; i < permList.size(); i++ ) {
+ final String p = permList.get( i );
+ ImageButton del = new ImageButton( "images/delete_item_small.gif",
+ constants.RemovePermission(),
+ new ClickListener() { //NON-NLS
+ public void onClick(Widget w) {
+ if ( Window.confirm( Format.format( constants.AreYouSureYouWantToRemovePermission0(),
+ p ) ) ) {
+ permList.remove( p );
+ if ( permList.size() == 0 ) {
+ perms.remove( permType );
+ }
+ doPermsPanel( perms,
+ vp );
+ }
+ }
+ } );
- editor.show();
- LoadingPopup.close();
- }
- });
- }
+ g.setWidget( i + 1,
+ 1,
+ new SmallLabel( p ) );
+ g.setWidget( i + 1,
+ 2,
+ del );
+ }
+ vp.add( g );
+ }
- /**
- * The permissions panel.
- */
- private Widget doPermsPanel(final Map<String, List<String>> perms, final Panel vp) {
- vp.clear();
+ }
- for (Map.Entry<String, List<String>> perm : perms.entrySet()) {
- if (perm.getKey().equals("admin")) { //NON-NLS
- HorizontalPanel h = new HorizontalPanel();
- h.add(new HTML("<b>" + constants.ThisUserIsAnAdministrator() + "</b>")); //NON-NLS
- com.google.gwt.user.client.ui.Button del = new com.google.gwt.user.client.ui.Button(constants.RemoveAdminRights());
+ //now to be able to add...
+ ImageButton newPermission = new ImageButton( "images/new_item.gif",
+ constants.AddANewPermission(),
+ new ClickListener() { //NON-NLS
+ public void onClick(Widget w) {
+ final FormStylePopup pop = new FormStylePopup();
+ final ListBox permTypeBox = new ListBox();
+ permTypeBox.addItem( constants.Loading() );
- del.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- if (Window.confirm(constants.AreYouSureYouWantToRemoveAdministratorPermissions())) {
- perms.remove("admin"); //NON-NLS
- doPermsPanel(perms, vp);
- }
- }
- });
- h.add(del);
- vp.add(h);
- } else {
- final String permType = perm.getKey();
- final List<String> permList = perm.getValue();
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add( permTypeBox );
+ hp.add( new InfoPopup( constants.PermissionDetails(),
+ constants.PermissionDetailsTip() ) );
+ pop.addAttribute( constants.PermissionType(),
+ hp );
- Grid g = new Grid(permList.size() + 1, 3);
- g.setWidget(0, 0, new HTML("<b>[" + permType + "] for:</b>")); //NON-NLS
+ RepositoryServiceFactory.getService().listAvailablePermissionTypes( new GenericCallback<String[]>() {
+ public void onSuccess(String[] items) {
+ permTypeBox.clear();
+ permTypeBox.addItem( constants.pleaseChoose1() );
+ for ( String s : items ) {
+ permTypeBox.addItem( s );
+ }
+ }
+ } );
- for (int i = 0; i < permList.size(); i++) {
- final String p = permList.get(i);
- ImageButton del = new ImageButton("images/delete_item_small.gif", constants.RemovePermission(), new ClickListener() { //NON-NLS
- public void onClick(Widget w) {
- if (Window.confirm(Format.format(constants.AreYouSureYouWantToRemovePermission0(), p))) {
- permList.remove(p);
- if (permList.size() == 0) {
- perms.remove(permType);
- }
- doPermsPanel(perms, vp);
- }
- }
- });
+ permTypeBox.addChangeListener( new ChangeListener() {
+ public void onChange(Widget w) {
+ pop.clear();
+ final String sel = permTypeBox.getItemText( permTypeBox.getSelectedIndex() );
+ if ( sel.equals( "admin" ) ) { //NON-NLS
+ com.google.gwt.user.client.ui.Button ok = new com.google.gwt.user.client.ui.Button( constants.OK() );
- g.setWidget(i + 1, 1, new SmallLabel(p));
- g.setWidget(i + 1, 2, del);
- }
+ pop.addAttribute( constants.MakeThisUserAdmin(),
+ ok );
+ ok.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ perms.put( "admin",
+ new ArrayList<String>() ); //NON-NLS
- vp.add(g);
- }
+ doPermsPanel( perms,
+ vp );
+ pop.hide();
+ }
+ } );
+ } else if ( sel.startsWith( "analyst" ) ) { //NON-NLS
+ CategoryExplorerWidget cat = new CategoryExplorerWidget( new CategorySelectHandler() {
+ public void selected(String selectedPath) {
+ if ( perms.containsKey( sel ) ) {
+ perms.get( sel ).add( "category=" + selectedPath ); //NON-NLS
+ } else {
+ List<String> ls = new ArrayList<String>();
+ ls.add( "category=" + selectedPath ); //NON-NLS
+ perms.put( sel,
+ ls );
+ }
+ doPermsPanel( perms,
+ vp );
+ pop.hide();
+ }
+ } );
+ pop.addAttribute( constants.SelectCategoryToProvidePermissionFor(),
+ cat );
+ } else if ( sel.startsWith( "package" ) ) {
+ final RulePackageSelector rps = new RulePackageSelector( true );
+ com.google.gwt.user.client.ui.Button ok = new com.google.gwt.user.client.ui.Button( constants.OK() );
+ ok.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ String pkName = rps.getSelectedPackage();
+ if ( perms.containsKey( sel ) ) {
+ perms.get( sel ).add( "package=" + pkName ); //NON-NLS
+ } else {
+ List<String> ls = new ArrayList<String>();
+ ls.add( "package=" + pkName ); //NON-NLS
+ perms.put( sel,
+ ls );
+ }
+ doPermsPanel( perms,
+ vp );
+ pop.hide();
- }
+ }
+ } );
- //now to be able to add...
- ImageButton newPermission = new ImageButton("images/new_item.gif", constants.AddANewPermission(), new ClickListener() { //NON-NLS
- public void onClick(Widget w) {
- final FormStylePopup pop = new FormStylePopup();
- final ListBox permTypeBox = new ListBox();
- permTypeBox.addItem(constants.Loading());
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add( rps );
+ hp.add( ok );
+ pop.addAttribute( constants.SelectPackageToApplyPermissionTo(),
+ hp );
+ }
+ }
+ } );
- HorizontalPanel hp = new HorizontalPanel();
- hp.add(permTypeBox);
- hp.add(new InfoPopup(constants.PermissionDetails(), constants.PermissionDetailsTip()));
- pop.addAttribute(constants.PermissionType(), hp);
+ pop.show();
+ }
+ } );
+ vp.add( newPermission );
+ return vp;
+ }
- RepositoryServiceFactory.getService().listAvailablePermissionTypes(new GenericCallback<String[]>() {
- public void onSuccess(String[] items) {
- permTypeBox.clear();
- permTypeBox.addItem(constants.pleaseChoose1());
- for (String s : items) { permTypeBox.addItem(s); }
- }
- });
+ private Object isCategory(List<String> permTypes) {
+ for ( String s : permTypes ) {
+ if ( s.startsWith( "analyst" ) ) return constants.Yes(); //NON-NLS
+ }
+ return "";
+ }
- permTypeBox.addChangeListener(new ChangeListener() {
- public void onChange(Widget w) {
- pop.clear();
- final String sel = permTypeBox.getItemText(permTypeBox.getSelectedIndex());
- if (sel.equals("admin")) { //NON-NLS
- com.google.gwt.user.client.ui.Button ok = new com.google.gwt.user.client.ui.Button(constants.OK());
+ private String isPackage(List<String> permTypes) {
+ for ( String s : permTypes ) {
+ if ( s.startsWith( "package" ) ) return constants.Yes();
+ }
+ return "";
+ }
- pop.addAttribute(constants.MakeThisUserAdmin(), ok);
- ok.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- perms.put("admin", new ArrayList<String>()); //NON-NLS
+ private String isAdmin(List<String> permTypes) {
+ if ( permTypes.contains( "admin" ) ) { //NON-NLS
+ return constants.Yes();
+ } else {
+ return "";
+ }
+ }
- doPermsPanel(perms, vp);
- pop.hide();
- }
- });
- } else if (sel.startsWith("analyst")) { //NON-NLS
- CategoryExplorerWidget cat = new CategoryExplorerWidget(new CategorySelectHandler() {
- public void selected(String selectedPath) {
- if (perms.containsKey(sel)) {
- perms.get(sel).add("category=" + selectedPath); //NON-NLS
- } else {
- List<String> ls = new ArrayList<String>();
- ls.add("category=" + selectedPath); //NON-NLS
- perms.put(sel, ls);
- }
- doPermsPanel(perms, vp);
- pop.hide();
- }
- });
- pop.addAttribute(constants.SelectCategoryToProvidePermissionFor(), cat);
- } else if (sel.startsWith("package")) {
- final RulePackageSelector rps = new RulePackageSelector(true);
- com.google.gwt.user.client.ui.Button ok = new com.google.gwt.user.client.ui.Button(constants.OK());
- ok.addClickListener(new ClickListener() {
- public void onClick(Widget w) {
- String pkName = rps.getSelectedPackage();
- if (perms.containsKey(sel)) {
- perms.get(sel).add("package=" + pkName); //NON-NLS
- } else {
- List<String> ls = new ArrayList<String>();
- ls.add("package=" + pkName); //NON-NLS
- perms.put(sel, ls);
- }
-
- doPermsPanel(perms, vp);
- pop.hide();
-
-
- }
- });
-
- HorizontalPanel hp = new HorizontalPanel();
- hp.add(rps);
- hp.add(ok);
- pop.addAttribute(constants.SelectPackageToApplyPermissionTo(), hp);
- }
- }
- });
-
- pop.show();
- }
- });
- vp.add(newPermission);
- return vp;
- }
-
- private Object isCategory(List<String> permTypes) {
- for (String s : permTypes) {
- if (s.startsWith("analyst")) return constants.Yes(); //NON-NLS
- }
- return "";
- }
-
- private String isPackage(List<String> permTypes) {
- for (String s : permTypes) {
- if (s.startsWith("package")) return constants.Yes();
- }
- return "";
- }
-
- private String isAdmin(List<String> permTypes) {
- if (permTypes.contains("admin")) { //NON-NLS
- return constants.Yes();
- } else {
- return "";
- }
- }
-
-
-
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/categorynav/CategoryEditor.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -37,6 +37,7 @@
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.Command;
@@ -47,7 +48,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
/**
* This provides a popup for editing a category (name etc).
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/GenericCallback.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2010 JBoss Inc
+/*
+ * Copyright 2005 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,30 +16,15 @@
package org.drools.guvnor.client.common;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
import org.drools.guvnor.client.rpc.DetailedSerializationException;
import org.drools.guvnor.client.rpc.SessionExpiredException;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HTML;
-import com.gwtext.client.util.Format;
/**
* This is a generic call back that handles errors (very simply).
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,6 +39,7 @@
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.dt.ActionCol;
@@ -81,7 +82,6 @@
import com.gwtext.client.data.SortState;
import com.gwtext.client.data.Store;
import com.gwtext.client.data.StringFieldDef;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.ToolbarMenuButton;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerNodeConfig.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,12 +28,12 @@
import org.drools.guvnor.client.ruleeditor.MultiViewRow;
import org.drools.guvnor.client.rulelist.EditItemEvent;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Timer;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.data.Node;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerViewCenterPanel.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,7 @@
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.rulelist.EditItemEvent;
import org.drools.guvnor.client.rulelist.QueryWidget;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -49,7 +50,6 @@
import com.gwtext.client.core.Ext;
import com.gwtext.client.core.Margins;
import com.gwtext.client.core.RegionPosition;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Button;
import com.gwtext.client.widgets.Component;
import com.gwtext.client.widgets.Container;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/factmodel/FactModelWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,7 @@
import org.drools.guvnor.client.ruleeditor.DefaultRuleContentWidget;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.ruleeditor.SaveEventListener;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -52,7 +53,6 @@
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.form.FormPanel;
/**
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.modeldriven.ui;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,11 +14,14 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.modeldriven.ui;
+
import org.drools.guvnor.client.common.*;
import org.drools.guvnor.client.modeldriven.HumanReadable;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.FieldAccessorsAndMutators;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -48,7 +33,6 @@
import com.google.gwt.user.client.ui.*;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
-import com.gwtext.client.util.Format;
/**
* This is used when asserting a new fact into working memory.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,20 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.modeldriven.ui;
+
import org.drools.guvnor.client.common.ClickableLabel;
import org.drools.guvnor.client.common.DirtyableFlexTable;
import org.drools.guvnor.client.common.FormStylePopup;
@@ -38,6 +23,7 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.HumanReadable;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.FieldAccessorsAndMutators;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -56,7 +42,6 @@
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.MouseListenerAdapter;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* This widget is for setting fields on a bound fact or global variable.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2010 JBoss Inc
+/*
+ * Copyright 2005 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,21 +16,6 @@
package org.drools.guvnor.client.modeldriven.ui;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
import java.util.ArrayList;
import java.util.Iterator;
@@ -40,6 +25,7 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.common.ValueChanged;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.DSLSentence;
import org.drools.ide.common.client.modeldriven.ui.ConstraintValueEditorHelper;
@@ -56,7 +42,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* This displays a widget to edit a DSL sentence.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,7 @@
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ExpressionCollectionIndex;
import org.drools.ide.common.client.modeldriven.brl.ExpressionFieldVariable;
@@ -54,7 +55,6 @@
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
public class ExpressionBuilder extends RuleModellerWidget implements HasExpressionTypeChangeHandlers, HasExpressionChangeHandlers {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -42,6 +42,7 @@
import org.drools.guvnor.client.modeldriven.HumanReadable;
import org.drools.guvnor.client.modeldriven.ui.factPattern.Connectives;
import org.drools.guvnor.client.modeldriven.ui.factPattern.PopupCreator;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.brl.CompositeFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
import org.drools.ide.common.client.modeldriven.brl.FieldConstraint;
@@ -67,7 +68,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.gwtext.client.util.Format;
/**
* This is the new smart widget that works off the model.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/GlobalCollectionAddWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/GlobalCollectionAddWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/GlobalCollectionAddWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,20 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,12 +14,14 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.modeldriven.ui;
+
import org.drools.guvnor.client.common.DirtyableFlexTable;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.*;
-import com.gwtext.client.util.Format;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.ide.common.client.modeldriven.brl.ActionGlobalCollectionAdd;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,20 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.modeldriven.ui;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.modeldriven.ui;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -62,6 +47,7 @@
import org.drools.guvnor.client.rpc.VerificationServiceAsync;
import org.drools.guvnor.client.ruleeditor.RuleViewer;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ActionCallMethod;
import org.drools.ide.common.client.modeldriven.brl.ActionGlobalCollectionAdd;
@@ -107,7 +93,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.ExtElement;
-import com.gwtext.client.util.Format;
/**
* This is the parent widget that contains the model based rule builder.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/PopupCreator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/PopupCreator.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/factPattern/PopupCreator.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.FieldAccessorsAndMutators;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.CompositeFieldConstraint;
@@ -42,7 +43,6 @@
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
public class PopupCreator {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.packages;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.packages;
+
import org.drools.guvnor.client.common.ErrorPopup;
import org.drools.guvnor.client.common.FormStyleLayout;
import org.drools.guvnor.client.common.FormStylePopup;
@@ -42,6 +26,7 @@
import org.drools.guvnor.client.common.RulePackageSelector;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -62,7 +47,6 @@
import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteHandler;
import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.FormPanel.SubmitHandler;
-import com.gwtext.client.util.Format;
/**
* This is the wizard used when creating new packages or importing them.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewSubPackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewSubPackageWizard.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewSubPackageWizard.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.packages;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.packages;
+
import org.drools.guvnor.client.common.ErrorPopup;
import org.drools.guvnor.client.common.FormStyleLayout;
import org.drools.guvnor.client.common.FormStylePopup;
@@ -42,6 +26,7 @@
import org.drools.guvnor.client.common.RulePackageSelector;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -60,7 +45,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* This is the wizard used when creating new packages or importing them.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageBuilderWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2010 JBoss Inc
+/*
+ * Copyright 2050 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,22 +16,6 @@
package org.drools.guvnor.client.packages;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -49,6 +33,7 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.SnapshotInfo;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.core.client.GWT;
@@ -88,7 +73,6 @@
import com.gwtext.client.widgets.grid.GridPanel;
import com.gwtext.client.widgets.grid.Renderer;
import com.gwtext.client.widgets.grid.event.GridRowListenerAdapter;
-import com.gwtext.client.util.Format;
/**
* This is the widget for building packages, validating etc. Visually decorates
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.packages;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.packages;
+
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -52,6 +36,7 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.ValidatedResponse;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.core.client.GWT;
@@ -72,7 +57,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* This is the package editor and viewer for package configuration.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotDiffView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotDiffView.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotDiffView.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.SnapshotDiff;
import org.drools.guvnor.client.rpc.SnapshotDiffs;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Composite;
@@ -34,7 +35,6 @@
import com.gwtext.client.data.RecordDef;
import com.gwtext.client.data.Store;
import com.gwtext.client.data.StringFieldDef;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.grid.CellMetadata;
import com.gwtext.client.widgets.grid.ColumnConfig;
import com.gwtext.client.widgets.grid.ColumnModel;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,6 +37,7 @@
import org.drools.guvnor.client.rulelist.AssetItemGrid;
import org.drools.guvnor.client.rulelist.AssetItemGridDataLoader;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -55,7 +56,6 @@
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.EventObject;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.tree.TreeNode;
import com.gwtext.client.widgets.tree.TreePanel;
import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
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-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,12 +41,12 @@
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.FactTypeFilter;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
-import com.gwtext.client.util.Format;
/**
* This utility cache will maintain a cache of suggestion completion engines,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/AnalysisView.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@
import org.drools.guvnor.client.rpc.VerificationService;
import org.drools.guvnor.client.rpc.VerificationServiceAsync;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.ui.Button;
@@ -34,7 +35,6 @@
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
/**
* Viewer for, well, analysis !
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/BulkRunResultWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@
import org.drools.guvnor.client.rpc.BulkTestRunResult;
import org.drools.guvnor.client.rpc.ScenarioResultSummary;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.Command;
@@ -39,7 +40,6 @@
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
/**
* This presents the results of a bulk run.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/FactUsagesItem.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +18,12 @@
import org.drools.guvnor.client.rpc.AnalysisFactUsage;
import org.drools.guvnor.client.rpc.AnalysisFieldUsage;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.TreeItem;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifierResultWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,7 @@
import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.client.rpc.AnalysisReportLine;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Composite;
@@ -28,7 +29,6 @@
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.TreeListener;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* Shows the results of an analysis run.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFactWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,12 +19,12 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.*;
-import com.gwtext.client.util.Format;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.ImageButton;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.common.ValueChanged;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyFieldConstraintEditor.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,6 +37,7 @@
import org.drools.guvnor.client.modeldriven.ui.ActionValueEditor;
import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
import org.drools.guvnor.client.modeldriven.ui.EnumDropDown;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
@@ -57,7 +58,6 @@
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* Constraint editor for the VerifyField of the expect part
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/VerifyRulesFiredWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,7 @@
import org.drools.guvnor.client.common.ImageButton;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
import org.drools.ide.common.client.modeldriven.testing.VerifyRuleFired;
@@ -41,7 +42,6 @@
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* Created by IntelliJ IDEA.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/DataInputWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.common.ValueChanged;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
@@ -45,7 +46,6 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* Created by IntelliJ IDEA.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExecutionWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExecutionWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ExecutionWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,10 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.*;
-import com.gwtext.client.util.Format;
import org.drools.guvnor.client.common.ErrorPopup;
import org.drools.guvnor.client.common.SmallLabel;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import java.util.Date;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/FieldDataConstraintEditor.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,6 +32,7 @@
import org.drools.guvnor.client.modeldriven.ui.DatePickerLabel;
import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
import org.drools.guvnor.client.modeldriven.ui.EnumDropDown;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
@@ -52,7 +53,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* Constraint editor for the FieldData in the Given Section
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalButton.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.ImageButton;
import org.drools.guvnor.client.messages.Constants;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
@@ -30,7 +31,6 @@
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.ListBox;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/GlobalFactWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
package org.drools.guvnor.client.qa.testscenarios;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/InsertFactWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,13 +17,13 @@
package org.drools.guvnor.client.qa.testscenarios;
import org.drools.guvnor.client.common.ErrorPopup;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
import org.drools.ide.common.client.modeldriven.testing.Fixture;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/ModifyFactWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
package org.drools.guvnor.client.qa.testscenarios;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FixtureList;
import org.drools.ide.common.client.modeldriven.testing.Scenario;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/NewDataButton.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
import java.util.List;
import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.ActivateRuleFlowGroup;
import org.drools.ide.common.client.modeldriven.testing.ExecutionTrace;
import org.drools.ide.common.client.modeldriven.testing.FactData;
@@ -30,7 +31,6 @@
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.TextBox;
-import com.gwtext.client.util.Format;
/**
*
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/testscenarios/TestRunnerWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.*;
-import com.gwtext.client.util.Format;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
import org.drools.guvnor.client.common.SmallLabel;
@@ -29,6 +28,7 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.ScenarioRunResult;
import org.drools.guvnor.client.rpc.SingleScenarioResult;
+import org.drools.guvnor.client.util.Format;
import org.drools.ide.common.client.modeldriven.testing.*;
import java.util.Iterator;
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-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.ruleeditor;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.ruleeditor;
+
import java.util.Set;
import com.google.gwt.core.client.GWT;
@@ -43,7 +27,6 @@
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.EventObject;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Button;
import com.gwtext.client.widgets.QuickTipsConfig;
import com.gwtext.client.widgets.Toolbar;
@@ -69,6 +52,7 @@
import org.drools.guvnor.client.modeldriven.ui.RuleModelEditor;
import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.packages.PackageBuilderWidget;
import org.drools.guvnor.client.packages.WorkingSetManager;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/BPELWrapper.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,13 +20,13 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.AssetAttachmentFileWidget;
import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.gwtext.client.core.EventObject;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.ToolbarButton;
import com.gwtext.client.widgets.event.ButtonListenerAdapter;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,6 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.Window;
import com.google.gwt.http.client.URL;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Panel;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.SmallLabel;
@@ -44,6 +43,7 @@
import org.drools.guvnor.client.explorer.ExplorerLayoutManager;
import org.drools.guvnor.client.explorer.CategoriesPanel;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.guvnor.client.util.Format;
import java.util.Date;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/MetaDataWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,21 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.ruleeditor;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -32,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.ruleeditor;
+
import java.util.Date;
import org.drools.guvnor.client.common.*;
@@ -40,6 +24,7 @@
import org.drools.guvnor.client.rpc.MetaData;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.security.Capabilities;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -55,7 +40,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.form.FormPanel;
import com.gwtext.client.widgets.form.event.FormPanelListener;
import com.gwtext.client.widgets.form.event.FormPanelListenerAdapter;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/NewAssetWizard.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,20 +1,3 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.guvnor.client.ruleeditor;
/*
* Copyright 2005 JBoss Inc
*
@@ -31,6 +14,7 @@
* limitations under the License.
*/
+package org.drools.guvnor.client.ruleeditor;
import org.drools.guvnor.client.categorynav.CategoryExplorerWidget;
@@ -45,6 +29,7 @@
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Command;
@@ -61,7 +46,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* This provides a popup for creating a new rule/asset from scratch.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -44,6 +44,7 @@
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rulelist.EditItemEvent;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -58,7 +59,6 @@
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.util.Format;
/**
* The main layout parent/controller the rule viewer.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/VersionBrowser.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -46,6 +46,7 @@
import org.drools.guvnor.client.rpc.TableDataResult;
import org.drools.guvnor.client.rpc.TableDataRow;
import org.drools.guvnor.client.table.DataModel;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import com.google.gwt.user.client.Command;
@@ -62,7 +63,6 @@
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
/**
* This widget shows a list of versions.
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2010 JBoss Inc
+/*
+ * Copyright 2005 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,21 +16,6 @@
package org.drools.guvnor.client.rulelist;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
import java.util.Date;
import java.util.HashMap;
@@ -47,6 +32,7 @@
import org.drools.guvnor.client.rpc.TableDataRow;
import org.drools.guvnor.client.ruleeditor.EditorLauncher;
import org.drools.guvnor.client.ruleeditor.MultiViewRow;
+import org.drools.guvnor.client.util.Format;
import com.google.gwt.core.client.GWT;
import com.google.gwt.i18n.client.DateTimeFormat;
@@ -64,7 +50,6 @@
import com.gwtext.client.data.RecordDef;
import com.gwtext.client.data.Store;
import com.gwtext.client.data.StringFieldDef;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Button;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.ToolbarButton;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java 2010-08-26 11:30:32 UTC (rev 34893)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2010 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,7 @@
import org.drools.guvnor.client.explorer.Preferences;
import org.drools.guvnor.client.rpc.MetaDataQuery;
import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
+import org.drools.guvnor.client.util.Format;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.modeldriven.ui.DatePickerLabel;
import org.drools.guvnor.client.modeldriven.ui.DatePickerTextBox;
@@ -35,7 +36,6 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.*;
import com.google.gwt.core.client.GWT;
-import com.gwtext.client.util.Format;
import com.gwtext.client.widgets.Panel;
public class QueryWidget extends Composite {
Added: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.guvnor.client.util;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public class Format {
+
+ public static String format(String text,
+ String... strings) {
+
+ StringBuilder result = new StringBuilder( text );
+
+ for ( int i = 0; i < strings.length; i++ ) {
+ String string = strings[i];
+ String placeKeeper = "{" + i + "}";
+
+ int start = result.indexOf( placeKeeper );
+ int end = start + placeKeeper.length();
+
+ result.replace( start,
+ end,
+ string );
+ }
+
+ return result.toString();
+ }
+
+ public static String format(String text,
+ int... ints) {
+ return format( text,
+ toStringArray( ints ) );
+ }
+
+ private static String[] toStringArray(int[] intArray) {
+ String[] result = new String[intArray.length];
+
+ for ( int i = 0; i < intArray.length; i++ ) {
+ result[i] = String.valueOf( intArray[i] );
+
+ }
+
+ return result;
+ }
+}
Added: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java 2010-08-26 11:42:54 UTC (rev 34894)
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.guvnor.client.util;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+/**
+ *
+ * @author rikkola
+ *
+ */
+public class FormatTest {
+
+ @Test
+ public void simpleFormatting() {
+ String test = "test {0}";
+
+ String result = Format.format( test,
+ "hello" );
+
+ Assert.assertEquals( "test hello",
+ result );
+ }
+
+ @Test
+ public void formatTwoFormat() {
+ String test = "test {0} {1}";
+
+ String result = Format.format( test,
+ new String[]{"hello", "toni"} );
+
+ Assert.assertEquals( "test hello toni",
+ result );
+
+ }
+
+ @Test
+ public void intFormat() {
+ String test = "number: {0} ";
+
+ String result = Format.format( test,
+ 123456 );
+
+ Assert.assertEquals( "number: 123456 ",
+ result );
+
+ }
+
+ @Test
+ public void severalInts() {
+ String test = "Lotto numbers are: {0}, {1}, {2}, {3} ";
+
+ String result = Format.format( test,
+ 4,
+ 12,
+ 42,
+ 44 );
+
+ Assert.assertEquals( "Lotto numbers are: 4, 12, 42, 44 ",
+ result );
+
+ }
+
+ @Test
+ public void tripleFormat() {
+ String test = "{0}, this test called {1} was created by {2}";
+
+ String result = Format.format( test,
+ "Hello",
+ "tripleFormat",
+ "Toni" );
+
+ Assert.assertEquals( "Hello, this test called tripleFormat was created by Toni",
+ result );
+ }
+
+ @Test
+ public void failingFormat() {
+ String test = "{0}, this test called {1} was created by {2}";
+
+ String result = Format.format( test,
+ new String[]{"Hello", "Toni"} );
+
+ Assert.assertNotNull( result );
+
+ Assert.assertEquals( "Hello, this test called Toni was created by {2}",
+ result );
+ }
+}
More information about the jboss-svn-commits
mailing list