Return-Path: X-Original-To: apmail-hdt-commits-archive@minotaur.apache.org Delivered-To: apmail-hdt-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 368B41051A for ; Fri, 23 May 2014 03:21:35 +0000 (UTC) Received: (qmail 99262 invoked by uid 500); 23 May 2014 03:21:35 -0000 Delivered-To: apmail-hdt-commits-archive@hdt.apache.org Received: (qmail 99238 invoked by uid 500); 23 May 2014 03:21:35 -0000 Mailing-List: contact commits-help@hdt.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hdt.incubator.apache.org Delivered-To: mailing list commits@hdt.incubator.apache.org Received: (qmail 99231 invoked by uid 99); 23 May 2014 03:21:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 03:21:35 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 May 2014 03:21:33 +0000 Received: (qmail 98768 invoked by uid 99); 23 May 2014 03:21:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 03:21:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8EDFB99E5E3; Fri, 23 May 2014 03:21:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rsharma@apache.org To: commits@hdt.incubator.apache.org Date: Fri, 23 May 2014 03:21:10 -0000 Message-Id: <2b3bc76290df4010b0e6bcedb12f39ef@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: HDT-53: prompt user for hadoop perspective on adding zookeeper server/hadoop server X-Virus-Checked: Checked by ClamAV on apache.org HDT-53: prompt user for hadoop perspective on adding zookeeper server/hadoop server Project: http://git-wip-us.apache.org/repos/asf/incubator-hdt/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hdt/commit/ec415a98 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hdt/tree/ec415a98 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hdt/diff/ec415a98 Branch: refs/heads/hadoop-eclipse-merge-development Commit: ec415a9809821a077ec0ed48d0dca45a7817d48a Parents: 4514771 Author: Rahul Sharma Authored: Thu May 15 14:51:02 2014 +0530 Committer: Rahul Sharma Committed: Fri May 23 08:46:13 2014 +0530 ---------------------------------------------------------------------- .../hdt/ui/internal/hdfs/NewHDFSWizard.java | 22 ++++++++++++++++-- .../internal/zookeeper/NewZooKeeperWizard.java | 24 +++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/ec415a98/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSWizard.java ---------------------------------------------------------------------- diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSWizard.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSWizard.java index 4cd40de..9b0706c 100644 --- a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSWizard.java +++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/hdfs/NewHDFSWizard.java @@ -20,17 +20,23 @@ package org.apache.hdt.ui.internal.hdfs; import org.apache.hdt.core.internal.hdfs.HDFSManager; import org.apache.hdt.ui.Activator; import org.apache.log4j.Logger; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; -public class NewHDFSWizard extends Wizard implements INewWizard { +public class NewHDFSWizard extends Wizard implements INewWizard,IExecutableExtension { private static Logger logger = Logger.getLogger(NewHDFSWizard.class); private NewHDFSServerWizardPage serverLocationWizardPage = null; + private IConfigurationElement configElement; public NewHDFSWizard() { // TODO Auto-generated constructor stub @@ -56,6 +62,11 @@ public class NewHDFSWizard extends Wizard implements INewWizard { @Override public boolean performFinish() { + Display.getDefault().syncExec(new Runnable() { + public void run() { + BasicNewProjectResourceWizard.updatePerspective(configElement); + } + }); if (serverLocationWizardPage != null) { String ambariUrl = serverLocationWizardPage.getHdfsServerLocation(); if (ambariUrl != null) { @@ -79,7 +90,14 @@ public class NewHDFSWizard extends Wizard implements INewWizard { } return false; } - + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData + * (org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) + */ + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { + this.configElement=config; + } } http://git-wip-us.apache.org/repos/asf/incubator-hdt/blob/ec415a98/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/zookeeper/NewZooKeeperWizard.java ---------------------------------------------------------------------- diff --git a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/zookeeper/NewZooKeeperWizard.java b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/zookeeper/NewZooKeeperWizard.java index 405773a..60e740b 100644 --- a/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/zookeeper/NewZooKeeperWizard.java +++ b/org.apache.hdt.ui/src/org/apache/hdt/ui/internal/zookeeper/NewZooKeeperWizard.java @@ -19,18 +19,26 @@ package org.apache.hdt.ui.internal.zookeeper; import org.apache.hdt.core.internal.zookeeper.ZooKeeperManager; import org.apache.hdt.ui.Activator; +import org.apache.hdt.ui.internal.launch.HadoopLocationWizard; +import org.apache.hdt.ui.internal.launch.ServerRegistry; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; -public class NewZooKeeperWizard extends Wizard implements INewWizard { +public class NewZooKeeperWizard extends Wizard implements INewWizard,IExecutableExtension { //private static Logger logger = Logger.getLogger(NewZooKeeperWizard.class); private NewZooKeeperServerWizardPage serverLocationWizardPage = null; + private IConfigurationElement configElement; public NewZooKeeperWizard() { } @@ -55,6 +63,11 @@ public class NewZooKeeperWizard extends Wizard implements INewWizard { @Override public boolean performFinish() { + Display.getDefault().syncExec(new Runnable() { + public void run() { + BasicNewProjectResourceWizard.updatePerspective(configElement); + } + }); if (serverLocationWizardPage != null) { String ambariUrl = serverLocationWizardPage.getZkServerLocation(); if (ambariUrl != null) { @@ -78,4 +91,13 @@ public class NewZooKeeperWizard extends Wizard implements INewWizard { return false; } + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData + * (org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) + */ + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { + this.configElement=config; + } + }