[jboss-svn-commits] JBL Code SVN: r33411 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools: guvnor/client/explorer/grid/panels and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 8 17:03:13 EDT 2010
Author: diegoll
Date: 2010-06-08 17:03:12 -0400 (Tue, 08 Jun 2010)
New Revision: 33411
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/LocalProviderView.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.ui.xml
Removed:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/HornetQFactoryPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/RioFactoryPanel.java
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
Log:
major ui refactor
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/LocalProviderView.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/LocalProviderView.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/LocalProviderView.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -0,0 +1,5 @@
+package org.drools.guvnor.client.explorer.grid.model;
+
+public class LocalProviderView extends GenericProviderView {
+
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -25,7 +25,7 @@
fillPanelGenericData(panel, gridTopology, executionEnvironment);
- getService().queryGridResourceInfo(gridTopology, executionEnvironment, new GenericCallback<GridResourceInfo>() {
+ getService().queryExecutionEnvironmentInfo(gridTopology, executionEnvironment, new GenericCallback<GridResourceInfo>() {
public void onSuccess(GridResourceInfo result) {
addInfoToPanel(panel, result);
}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/HornetQFactoryPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/HornetQFactoryPanel.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/HornetQFactoryPanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -1,24 +0,0 @@
-package org.drools.guvnor.client.explorer.grid.panels;
-
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
-
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-public class HornetQFactoryPanel extends Composite implements ProviderFactory{
-
- public HornetQFactoryPanel() {
- VerticalPanel panel = new VerticalPanel();
- fillPanel(panel);
- initWidget(panel);
- }
-
- private void fillPanel(VerticalPanel panel) {
- panel.add(new Label("Hornyyyyy"));
- }
-
- public GenericProviderView getProvider() {
- return null;
- }
-}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -0,0 +1,25 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
+import org.drools.guvnor.client.explorer.grid.model.LocalProviderView;
+
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.VerticalPanel;
+
+public class LocalProviderFactoryPanel extends Composite implements ProviderFactory{
+
+ public LocalProviderFactoryPanel() {
+ VerticalPanel panel = new VerticalPanel();
+ fillPanel(panel);
+ initWidget(panel);
+ }
+
+ private void fillPanel(VerticalPanel panel) {
+ panel.add(new Label("Local provider doesn't have custom configurations"));
+ }
+
+ public GenericProviderView getProvider() {
+ return new LocalProviderView();
+ }
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -25,6 +25,8 @@
public abstract class NewGridResourcePanel extends Composite {
private TopologyAssetsServiceAsync assetService;
+ private Button addEnvironmentAction;
+ private Button addDirectoryAction;
public NewGridResourcePanel(final GridTopologyView gridTopology) {
@@ -33,7 +35,7 @@
final TextBox resourceName = new TextBox();
- Button addEnvironmentAction = new Button("Create As Environment");
+ addEnvironmentAction = new Button("Create As Environment");
addEnvironmentAction.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
GenericProviderView gridProvider = getGenericProvider(factoryPanel);
@@ -47,8 +49,9 @@
});
}
});
+
- Button addDirectoryAction = new Button("Create As Directory");
+ addDirectoryAction = new Button("Create As Directory");
addDirectoryAction.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
GenericProviderView gridProvider = getGenericProvider(factoryPanel);
@@ -62,8 +65,8 @@
});
}
});
- addDirectoryAction.setEnabled(false);
+ enableButtons(false);
final ListBox optionProviders = getFactoryOptions(factoryPanel);
@@ -84,47 +87,55 @@
private ListBox getFactoryOptions(final SimplePanel factoryPanel) {
final ListBox optionProviders = new ListBox();
optionProviders.setVisibleItemCount(1);
- final GridImplementations[] gridImplementantions = GridImplementations.values();
- for (GridImplementations gridImplementation : gridImplementantions) {
+ final GridProviders[] gridImplementantions = GridProviders.values();
+ optionProviders.addItem("Please select a provider");
+ for (GridProviders gridImplementation : gridImplementantions) {
optionProviders.addItem(gridImplementation.getLabel());
}
optionProviders.addChangeHandler(new ChangeHandler() {
public void onChange(ChangeEvent event) {
- GridImplementations gridImplementation = gridImplementantions[optionProviders.getSelectedIndex()];
+ factoryPanel.clear();
+ int selectedIndex = optionProviders.getSelectedIndex();
+ boolean firstElement = selectedIndex == 0;
+ if(firstElement){
+ enableButtons(false);
+ return;
+ }else{
+ enableButtons(true);
+ }
+ GridProviders gridImplementation = gridImplementantions[selectedIndex-1];
GWT.log(gridImplementation.getLabel());
- factoryPanel.clear();
factoryPanel.setWidget(gridImplementation.getFactoryWidget());
}
});
return optionProviders;
}
+ private void enableButtons(boolean enabled){
+ addEnvironmentAction.setEnabled(enabled);
+ addEnvironmentAction.setEnabled(enabled);
+ }
+
public abstract void onExecutionEnvironmentCreation(ExecutionEnvironmentView executionEnvironment);
public abstract void onDirectoryInstanceCreation(DirectoryInstanceView directoryInstance);
- private enum GridImplementations {
- MINA("Mina") {
+ private enum GridProviders {
+ MINA("Mina provider") {
@Override
public Widget getFactoryWidget() {
return new MinaFactoryPanel();
}
},
- HORNETQ("HornetQ") {
+ LOCAL("Local provider") {
@Override
public Widget getFactoryWidget() {
- return new HornetQFactoryPanel();
+ return new LocalProviderFactoryPanel();
}
- },
- RIO("Rio") {
- @Override
- public Widget getFactoryWidget() {
- return new RioFactoryPanel();
- }
};
private String label;
- private GridImplementations(String label) {
+ private GridProviders(String label) {
this.label = label;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -7,38 +7,41 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
public abstract class NewGridTopologyPanel extends Composite {
+ interface NewGridTopologyPanelUiBinder extends UiBinder<Widget, NewGridTopologyPanel> { }
+ private static NewGridTopologyPanelUiBinder uiBinder = GWT.create(NewGridTopologyPanelUiBinder.class);
+
+ @UiField
+ Button addTopologyAction;
+ @UiField
+ TextBox topologyName;
+
private TopologyAssetsServiceAsync assetService;
public NewGridTopologyPanel() {
- Panel panel = new VerticalPanel();
- final TextBox topologyName = new TextBox();
-
- Button addTopologyAction = new Button("Create");
- addTopologyAction.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- getService().createNewTopology(topologyName.getText(),
- new GenericCallback<GridTopologyView>() {
- public void onSuccess(GridTopologyView newTopology) {
- onGridTopologyCreation(newTopology);
- }
- });
- }
- });
-
- panel.add(topologyName);
- panel.add(addTopologyAction);
- initWidget(panel);
+ initWidget(uiBinder.createAndBindUi(this));
}
+ @UiHandler("addTopologyAction")
+ void onClick(ClickEvent e) {
+ getService().createNewTopology(topologyName.getText(),
+ new GenericCallback<GridTopologyView>() {
+ public void onSuccess(GridTopologyView newTopology) {
+ onGridTopologyCreation(newTopology);
+ }
+ });
+ }
+
+
public abstract void onGridTopologyCreation(GridTopologyView newTopology);
private TopologyAssetsServiceAsync getService() {
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.ui.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.ui.xml (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.ui.xml 2010-06-08 21:03:12 UTC (rev 33411)
@@ -0,0 +1,14 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:style>
+ .important {
+ font-weight: bold;
+ }
+ </ui:style>
+ <g:HTMLPanel>
+ Topology Name:
+ <g:TextBox ui:field="topologyName"/>
+ <g:Button ui:field="addTopologyAction" styleName="{style.important}" text="Create topology"/>
+ </g:HTMLPanel>
+</ui:UiBinder>
\ No newline at end of file
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/RioFactoryPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/RioFactoryPanel.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/RioFactoryPanel.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -1,24 +0,0 @@
-package org.drools.guvnor.client.explorer.grid.panels;
-
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
-
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-public class RioFactoryPanel extends Composite implements ProviderFactory{
-
- public RioFactoryPanel() {
- VerticalPanel panel = new VerticalPanel();
- fillPanel(panel);
- initWidget(panel);
- }
-
- private void fillPanel(VerticalPanel panel) {
- panel.add(new Label("Riooooo"));
- }
-
- public GenericProviderView getProvider() {
- return null;
- }
-}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -37,10 +37,10 @@
DirectoryInstanceView createDirectoryInstance(String name, GenericProviderView provider, GridTopologyView gridTopology);
/**
- * Queries the status of the {@link GridResource} inside the {@link GridTopology}
+ * Queries the status of the {@link ExecutionEnvironmentView} inside the {@link GridTopology}
* @param topology the data needed to create the {@link GridTopology}
- * @param gridResource the data needed to query the {@link GridTopology} for info
- * @return the status of the {@link GridResource} associated
+ * @param executionEnvironment the data needed to query the {@link GridTopology} for info
+ * @return the status of the {@link ExecutionEnvironmentView} associated
*/
- GridResourceInfo queryGridResourceInfo(GridTopologyView topology, GridResourceView gridResource);
+ GridResourceInfo queryExecutionEnvironmentInfo(GridTopologyView topology, ExecutionEnvironmentView executionEnvironment);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -22,8 +22,8 @@
GridTopologyView gridTopology,
AsyncCallback<ExecutionEnvironmentView> callback);
- void queryGridResourceInfo(GridTopologyView topology,
- GridResourceView gridResource,
+ void queryExecutionEnvironmentInfo(GridTopologyView topology,
+ ExecutionEnvironmentView executionEnvironment,
AsyncCallback<GridResourceInfo> callback);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-08 20:42:36 UTC (rev 33410)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-08 21:03:12 UTC (rev 33411)
@@ -6,7 +6,6 @@
import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
-import org.drools.guvnor.client.explorer.grid.model.GridResourceView;
import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo.Status;
import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
@@ -32,8 +31,10 @@
return newDirectoryInstance;
}
- public GridResourceInfo queryGridResourceInfo(GridTopologyView topology,
- GridResourceView gridResource) {
+ public GridResourceInfo queryExecutionEnvironmentInfo(
+ GridTopologyView topology,
+ ExecutionEnvironmentView executionEnvironment) {
+ executionEnvironment.getProvider();
return new GridResourceInfo(Status.MISSING, new HashMap<String, String>());
}
}
More information about the jboss-svn-commits
mailing list