diff options
Diffstat (limited to 'src')
4 files changed, 20 insertions, 16 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java index 8d1eb624..8fa247a1 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java @@ -71,6 +71,15 @@ public class Cluster extends Entity { this.discoveredServers = autoDiscoveredServers; children.add(new EntityGroup<Server>("Discovered Servers", Server.class, this, autoDiscoveredServers)); } + + public EntityGroup<Server> getAutoDiscoveredServersEntityGroup() { + for(Entity entity : getChildren()) { + if(entity instanceof EntityGroup && ((EntityGroup)entity).getEntityType() == Server.class) { + return (EntityGroup<Server>)entity; + } + } + return null; + } public List<Volume> getVolumes() { return volumes; diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java index d7731364..9ddb976a 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java @@ -47,7 +47,7 @@ public class DeleteVolumeAction extends AbstractActionDelegate { Integer deleteOption = new MessageDialog(getShell(), "Delete Volume", GUIHelper.getInstance().getImage( IImageKeys.VOLUME), warningMessage, MessageDialog.QUESTION, new String[] { "Cancel", - "Delete volume and it's data", "Delete volume, keep back-up of data" }, 2).open(); + "Delete volume, keep back-up of data", "Delete volume and it's data" }, 2).open(); if (deleteOption == 0) { return; } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java index 5e47da3b..2f696709 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java @@ -33,5 +33,4 @@ public interface IActionConstants { public static final String COMMAND_CREATE_VOLUME = "com.gluster.storage.management.gui.commands.CreateVolume"; public static final String COMMAND_ADD_SERVER = "com.gluster.storage.management.gui.commands.AddServer"; - public static final String VIEW_DISCOVERED_SERVER = "com.gluster.storage.management.gui.views.DiscoveredServerView"; } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java index fdc32c2a..079d6bcf 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java @@ -34,9 +34,11 @@ import org.eclipse.ui.part.ViewPart; import com.gluster.storage.management.client.GlusterDataModelManager; import com.gluster.storage.management.core.model.Cluster; -import com.gluster.storage.management.core.model.Entity; +import com.gluster.storage.management.core.model.EntityGroup; +import com.gluster.storage.management.core.model.GlusterDataModel; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.GlusterServer.SERVER_STATUS; +import com.gluster.storage.management.core.model.Server; import com.gluster.storage.management.core.model.Volume; import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS; import com.gluster.storage.management.gui.IImageKeys; @@ -54,7 +56,7 @@ public class ClusterSummaryView extends ViewPart { private final FormToolkit toolkit = new FormToolkit(Display.getCurrent()); private ScrolledForm form; private Cluster cluster; - private Entity entity; + private GlusterDataModel model = GlusterDataModelManager.getInstance().getModel(); /* * (non-Javadoc) @@ -64,8 +66,7 @@ public class ClusterSummaryView extends ViewPart { @Override public void createPartControl(Composite parent) { if (cluster == null) { - // cluster = (Cluster)guiHelper.getSelectedEntity(getSite(), Cluster.class); - cluster = (Cluster) GlusterDataModelManager.getInstance().getModel().getChildren().get(0); + cluster = model.getCluster(); } createSections(parent); @@ -143,17 +144,12 @@ public class ClusterSummaryView extends ViewPart { imageHyperlink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { - // TODO Open the "discovered servers" view programmatically" - IHandlerService hs = (IHandlerService) getSite().getService(IHandlerService.class); - try { - hs.executeCommand(IActionConstants.COMMAND_ADD_SERVER, null); - } catch (Exception e1) { - e1.printStackTrace(); - } + // Open the "discovered servers" view by selecting the corresponding entity in the navigation view + EntityGroup<Server> autoDiscoveredServersEntityGroup = GlusterDataModelManager.getInstance().getModel() + .getCluster().getAutoDiscoveredServersEntityGroup(); - NavigationView clusterView = (NavigationView) guiHelper - .getView(IActionConstants.VIEW_DISCOVERED_SERVER); - clusterView.selectEntity((entity)); + NavigationView navigationView = (NavigationView) guiHelper.getView(NavigationView.ID); + navigationView.selectEntity(autoDiscoveredServersEntityGroup); } }); } |