Permalink
Browse files

Merge branch 'master' of https://github.com/droolsjbpm/guvnor

  • Loading branch information...
2 parents eb3fc83 + 3c461ad commit 607bfa60815078802a4188ed04e4c466fe31383a @marianbuenosayres committed Aug 31, 2011
Showing with 178 additions and 166 deletions.
  1. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/{AcceptTabItem.java → AcceptItem.java}
  2. +4 −4 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/AssetEditorActivity.java
  3. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/FindActivity.java
  4. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/ModuleEditorActivity.java
  5. +3 −3 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/ModuleFormatsGridPlace.java
  6. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/MultiActivityManager.java
  7. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/MultiAssetActivity.java
  8. +12 −12 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/navigation/admin/ManagerActivity.java
  9. +3 −3 ...or-webapp/src/main/java/org/drools/guvnor/client/explorer/navigation/browse/CategoryActivity.java
  10. +6 −6 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/navigation/browse/InboxActivity.java
  11. +3 −3 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/navigation/browse/StateActivity.java
  12. +4 −4 ...ebapp/src/main/java/org/drools/guvnor/client/explorer/navigation/deployment/SnapshotActivity.java
  13. +3 −3 .../main/java/org/drools/guvnor/client/explorer/navigation/deployment/SnapshotAssetListActivity.java
  14. +4 −4 ...ebapp/src/main/java/org/drools/guvnor/client/explorer/navigation/qa/TestScenarioListActivity.java
  15. +4 −4 guvnor-webapp/src/main/java/org/drools/guvnor/client/explorer/navigation/qa/VerifierActivity.java
  16. +93 −46 guvnor-webapp/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties
  17. +3 −3 guvnor-webapp/src/main/java/org/drools/guvnor/client/packages/ModuleEditorWrapper.java
  18. +15 −50 guvnor-webapp/src/main/java/org/drools/guvnor/client/packages/SnapshotView.java
  19. +2 −2 guvnor-webapp/src/main/java/org/drools/guvnor/client/util/Activity.java
  20. +3 −3 guvnor-webapp/src/main/java/org/drools/guvnor/client/widgets/assetviewer/AssetViewerActivity.java
  21. +2 −2 ...r-webapp/src/test/java/org/drools/guvnor/client/explorer/MultiActivityManagerChangePlaceTest.java
  22. +1 −1 guvnor-webapp/src/test/java/org/drools/guvnor/client/explorer/MultiActivityManagerCloseTabsTest.java
  23. +3 −3 guvnor-webapp/src/test/java/org/drools/guvnor/client/explorer/MultiAssetActivityTest.java
@@ -17,7 +17,7 @@
import com.google.gwt.user.client.ui.IsWidget;
-public interface AcceptTabItem {
+public interface AcceptItem {
- void addTab(String title, IsWidget widget);
+ void add(String title, IsWidget widget);
}
@@ -44,7 +44,7 @@ public AssetEditorActivity(AssetEditorPlace place,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
this.eventBus = eventBus;
final boolean[] loading = {true};
@@ -63,7 +63,7 @@ public void run() {
loading );
}
- private void loadRuleAsset(final AcceptTabItem tabbedPanel,
+ private void loadRuleAsset(final AcceptItem tabbedPanel,
final String uuid,
final boolean[] loading) {
clientFactory.getAssetService().loadRuleAsset( uuid,
@@ -72,7 +72,7 @@ private void loadRuleAsset(final AcceptTabItem tabbedPanel,
loading ) );
}
- private GenericCallback<RuleAsset> createGenericCallback(final AcceptTabItem tabbedPanel,
+ private GenericCallback<RuleAsset> createGenericCallback(final AcceptItem tabbedPanel,
final boolean[] loading) {
return new GenericCallback<RuleAsset>() {
public void onSuccess(final RuleAsset ruleAsset) {
@@ -87,7 +87,7 @@ private Command createCommandForSuggestCompletionCache(final boolean[] loading,
public void execute() {
loading[0] = false;
- tabbedPanel.addTab(
+ tabbedPanel.add(
ruleAsset.getName(),
new RuleViewerWrapper(
clientFactory,
@@ -32,8 +32,8 @@ public FindActivity( ClientFactory clientFactory ) {
}
@Override
- public void start( AcceptTabItem tabbedPanel, EventBus eventBus ) {
- tabbedPanel.addTab(
+ public void start( AcceptItem tabbedPanel, EventBus eventBus ) {
+ tabbedPanel.add(
constants.Find(),
new QueryWidget( clientFactory )
);
@@ -41,15 +41,15 @@ public ModuleEditorActivity( String uuid, ClientFactory clientFactory ) {
}
@Override
- public void start( final AcceptTabItem acceptTabItem, final EventBus eventBus ) {
+ public void start( final AcceptItem acceptTabItem, final EventBus eventBus ) {
view.showLoadingPackageInformationMessage();
clientFactory.getPackageService().loadPackageConfig( uuid,
new GenericCallback<PackageConfigData>() {
public void onSuccess( PackageConfigData packageConfigData ) {
RulePackageSelector.currentlySelectedPackage = packageConfigData.getUuid();
- acceptTabItem.addTab(
+ acceptTabItem.add(
packageConfigData.name,
new ModuleEditorWrapper( packageConfigData, clientFactory, eventBus ) );
@@ -39,7 +39,7 @@ private String key() {
}
@Override
- public void start(AcceptTabItem tabbedPanel,
+ public void start(AcceptItem tabbedPanel,
EventBus eventBus) {
RulePackageSelector.currentlySelectedPackage = moduleFormatsGridPlace.getPackageConfigData().getName();
@@ -53,7 +53,7 @@ public void start(AcceptTabItem tabbedPanel,
moduleFormatsGridPlace.getTitle() );
}
- private void openPackageViewAssets(AcceptTabItem tabbedPanel,
+ private void openPackageViewAssets(AcceptItem tabbedPanel,
final String packageUuid,
final String packageName,
String key,
@@ -72,7 +72,7 @@ private void openPackageViewAssets(AcceptTabItem tabbedPanel,
formatIsRegistered,
feedUrl,
clientFactory );
- tabbedPanel.addTab( itemName
+ tabbedPanel.add( itemName
+ " ["
+ packageName
+ "]",
@@ -93,8 +93,8 @@ private void startNewActivity(final Place newPlace) {
activeActivities.put(newPlace, new Pair(activity, resettableEventBus));
activity.start(
- new AcceptTabItem() {
- public void addTab(String tabTitle, IsWidget widget) {
+ new AcceptItem() {
+ public void add(String tabTitle, IsWidget widget) {
tabbedPanel.addTab(
tabTitle,
widget,
@@ -16,7 +16,7 @@ public MultiAssetActivity(MultiAssetPlace place,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
MultiAssetView view = clientFactory.getNavigationViewFactory().getMultiAssetView();
@@ -26,7 +26,7 @@ public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
eventBus );
// addRows( view );
- tabbedPanel.addTab( getTitle(), view );
+ tabbedPanel.add( getTitle(), view );
}
private String getTitle() {
@@ -15,7 +15,7 @@
import org.drools.guvnor.client.admin.WorkspaceManager;
import org.drools.guvnor.client.common.FormStylePopup;
import org.drools.guvnor.client.common.SmallLabel;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
@@ -35,28 +35,28 @@ public ManagerActivity(int id, ClientFactory clientFactory) {
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
openAdministrationSelection(tabbedPanel, id);
}
- public void openAdministrationSelection(AcceptTabItem tabbedPanel, int id) {
+ public void openAdministrationSelection(AcceptItem tabbedPanel, int id) {
switch (id) {
case 0:
- tabbedPanel.addTab(constants.CategoryManager(),
+ tabbedPanel.add(constants.CategoryManager(),
new CategoryManager());
break;
case 1:
- tabbedPanel.addTab(constants.ArchivedManager(),
+ tabbedPanel.add(constants.ArchivedManager(),
new ArchivedAssetManager(clientFactory));
break;
case 2:
- tabbedPanel.addTab(constants.StateManager(),
+ tabbedPanel.add(constants.StateManager(),
new StateManager());
break;
case 3:
- tabbedPanel.addTab(constants.ImportExport(),
+ tabbedPanel.add(constants.ImportExport(),
new BackupManager());
break;
@@ -65,11 +65,11 @@ public void openAdministrationSelection(AcceptTabItem tabbedPanel, int id) {
RepositoryServiceAsync repositoryService = RepositoryServiceFactory.getService();
new EventLogPresenter(repositoryService,
eventLogView);
- tabbedPanel.addTab(constants.EventLog(),
+ tabbedPanel.add(constants.EventLog(),
eventLogView);
break;
case 5:
- tabbedPanel.addTab(constants.UserPermissionMappings(),
+ tabbedPanel.add(constants.UserPermissionMappings(),
new PermissionViewer());
break;
case 6:
@@ -93,15 +93,15 @@ public void openAdministrationSelection(AcceptTabItem tabbedPanel, int id) {
break;
case 7:
- tabbedPanel.addTab(constants.RulesVerificationManager(),
+ tabbedPanel.add(constants.RulesVerificationManager(),
new RuleVerifierManager());
break;
case 8:
- tabbedPanel.addTab(constants.RepositoryConfig(),
+ tabbedPanel.add(constants.RepositoryConfig(),
new RepoConfigManager());
break;
case 9:
- tabbedPanel.addTab(constants.Workspaces(),
+ tabbedPanel.add(constants.Workspaces(),
new WorkspaceManager());
break;
}
@@ -3,7 +3,7 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.Command;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.PushClient;
@@ -28,7 +28,7 @@ public CategoryActivity(String categoryPath,
}
@Override
- public void start(AcceptTabItem tabbedPanel,
+ public void start(AcceptItem tabbedPanel,
EventBus eventBus) {
final CategoryPagedTable table = new CategoryPagedTable( categoryPath,
GWT.getModuleBaseURL()
@@ -53,7 +53,7 @@ public void execute() {
} );
- tabbedPanel.addTab(
+ tabbedPanel.add(
constants.CategoryColon() + subStringCategoryName( categoryPath ),
table );
}
@@ -1,7 +1,7 @@
package org.drools.guvnor.client.explorer.navigation.browse;
import com.google.gwt.event.shared.EventBus;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.explorer.ExplorerNodeConfig;
import org.drools.guvnor.client.util.Activity;
@@ -20,7 +20,7 @@ public InboxActivity(InboxPlace place,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
if ( ExplorerNodeConfig.INCOMING_ID.equals( place.getInboxType() ) ) {
openInboxIncomingPagedTable(
tabbedPanel,
@@ -39,20 +39,20 @@ public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
}
}
- private void openInboxIncomingPagedTable(AcceptTabItem tabbedPanel,
+ private void openInboxIncomingPagedTable(AcceptItem tabbedPanel,
String title,
String type) {
- tabbedPanel.addTab(
+ tabbedPanel.add(
title,
new InboxIncomingPagedTable(
type,
clientFactory ) );
}
- private void openInboxPagedTable(AcceptTabItem tabbedPanel,
+ private void openInboxPagedTable(AcceptItem tabbedPanel,
String title,
String type) {
- tabbedPanel.addTab(
+ tabbedPanel.add(
title,
new InboxPagedTable(
type,
@@ -3,7 +3,7 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.Command;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.PushClient;
@@ -26,7 +26,7 @@ public StateActivity(String stateName,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
final StatePagedTable table = new StatePagedTable(
stateName,
clientFactory );
@@ -46,7 +46,7 @@ public void execute() {
}
} );
- tabbedPanel.addTab(
+ tabbedPanel.add(
constants.Status() + stateName,
table );
}
@@ -4,7 +4,7 @@
import com.google.gwt.event.shared.EventBus;
import org.drools.guvnor.client.common.GenericCallback;
import org.drools.guvnor.client.common.LoadingPopup;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.packages.SnapshotView;
@@ -33,7 +33,7 @@ public SnapshotActivity(String moduleName,
}
@Override
- public void start(final AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(final AcceptItem tabbedPanel, EventBus eventBus) {
clientFactory.getPackageService().loadSnapshotInfo(
moduleName,
snapshotName,
@@ -44,14 +44,14 @@ public void onSuccess(SnapshotInfo snapshotInfo) {
} );
}
- private void showTab(final AcceptTabItem tabbedPanel, final SnapshotInfo snapshotInfo) {
+ private void showTab(final AcceptItem tabbedPanel, final SnapshotInfo snapshotInfo) {
LoadingPopup.showMessage( constants.LoadingSnapshot() );
RepositoryServiceFactory.getPackageService().loadPackageConfig( snapshotInfo.getUuid(),
new GenericCallback<PackageConfigData>() {
public void onSuccess(PackageConfigData conf) {
- tabbedPanel.addTab( constants.SnapshotLabel( snapshotInfo.getName() ),
+ tabbedPanel.add( constants.SnapshotLabel( snapshotInfo.getName() ),
new SnapshotView(
clientFactory,
eventBus,
@@ -4,7 +4,7 @@
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.VerticalPanel;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.util.Activity;
@@ -25,8 +25,8 @@ public SnapshotAssetListActivity(SnapshotAssetListPlace place,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
- tabbedPanel.addTab(
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
+ tabbedPanel.add(
constants.SnapshotItems(),
getPanel() );
}
@@ -3,7 +3,7 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.EventBus;
import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.explorer.AcceptTabItem;
+import org.drools.guvnor.client.explorer.AcceptItem;
import org.drools.guvnor.client.explorer.ClientFactory;
import org.drools.guvnor.client.messages.Constants;
import org.drools.guvnor.client.rpc.PackageConfigData;
@@ -23,18 +23,18 @@ public TestScenarioListActivity(String moduleUuid,
}
@Override
- public void start(AcceptTabItem tabbedPanel, EventBus eventBus) {
+ public void start(AcceptItem tabbedPanel, EventBus eventBus) {
openTestScenario( tabbedPanel );
}
- public void openTestScenario(final AcceptTabItem tabbedPanel) {
+ public void openTestScenario(final AcceptItem tabbedPanel) {
clientFactory.getPackageService().loadPackageConfig(
moduleUuid,
new GenericCallback<PackageConfigData>() {
public void onSuccess(PackageConfigData packageConfigData) {
- tabbedPanel.addTab(
+ tabbedPanel.add(
constants.ScenariosForPackage( packageConfigData.getName() ),
new ScenarioPackageScreen(
packageConfigData.getUuid(),
Oops, something went wrong.

0 comments on commit 607bfa6

Please sign in to comment.