Author: adietish Date: 2011-12-06 16:56:25 -0500 (Tue, 06 Dec 2011) New Revision: 37021 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectEnablableProjectDialog.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java Log: [JBIDE-10171] renamed "select existing project" dialog class Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:53:09 UTC (rev 37020) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:56:25 UTC (rev 37021) @@ -276,7 +276,7 @@ @Override public void widgetSelected(SelectionEvent e) { - SelectEnablableProjectDialog dialog = new SelectEnablableProjectDialog(getShell()); + SelectExistingProjectDialog dialog = new SelectExistingProjectDialog(getShell()); if (dialog.open() == Dialog.OK) { Object selectedProject = dialog.getFirstResult(); if (selectedProject instanceof IProject) { Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectEnablableProjectDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectEnablableProjectDialog.java 2011-12-06 21:53:09 UTC (rev 37020) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectEnablableProjectDialog.java 2011-12-06 21:56:25 UTC (rev 37021) @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.ui.wizard; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.ui.ide.IDE.SharedImages; -import org.jboss.tools.openshift.egit.core.EGitUtils; -import org.jboss.tools.openshift.express.internal.utils.JavaProjectUtils; - -/** - * @author André Dietisheim - */ -public class SelectEnablableProjectDialog extends ElementListSelectionDialog { - - public SelectEnablableProjectDialog(Shell shell) { - super(shell, new ProjectLabelProvider()); - setTitle("Project Selection"); - setMessage("Please select the project that shall be pushed to OpenShift"); - setMultipleSelection(false); - setAllowDuplicates(false); - setElements(getProjects()); - } - - private Object[] getProjects() { - List<IProject> projects = new ArrayList<IProject>(); - for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { - if (isValid(project)) { - projects.add(project); - } - } - return projects.toArray(); - } - - private boolean isValid(IProject project) { - if (EGitUtils.isShared(project)) { - return false; - } - - if (EGitUtils.hasDotGitFolder(project)) { - return false; - } - - if (!JavaProjectUtils.isJavaProject(project)) { - return false; - } - - return true; - } - - private static class ProjectLabelProvider extends LabelProvider { - - @Override - public Image getImage(Object element) { - return PlatformUI.getWorkbench().getSharedImages().getImage(SharedImages.IMG_OBJ_PROJECT); - } - - @Override - public String getText(Object element) { - if (!(element instanceof IProject)) { - return null; - } - - return ((IProject) element).getName(); - } - - } - -} Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java (from rev 36986, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectEnablableProjectDialog.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2011-12-06 21:56:25 UTC (rev 37021) @@ -0,0 +1,85 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.wizard; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.ui.ide.IDE.SharedImages; +import org.jboss.tools.openshift.egit.core.EGitUtils; +import org.jboss.tools.openshift.express.internal.utils.JavaProjectUtils; + +/** + * @author André Dietisheim + */ +public class SelectExistingProjectDialog extends ElementListSelectionDialog { + + public SelectExistingProjectDialog(Shell shell) { + super(shell, new ProjectLabelProvider()); + setTitle("Project Selection"); + setMessage("Please select the project that shall be pushed to OpenShift"); + setMultipleSelection(false); + setAllowDuplicates(false); + setElements(getProjects()); + } + + private Object[] getProjects() { + List<IProject> projects = new ArrayList<IProject>(); + for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { + if (isValid(project)) { + projects.add(project); + } + } + return projects.toArray(); + } + + private boolean isValid(IProject project) { + if (EGitUtils.isShared(project)) { + return false; + } + + if (EGitUtils.hasDotGitFolder(project)) { + return false; + } + + if (!JavaProjectUtils.isJavaProject(project)) { + return false; + } + + return true; + } + + private static class ProjectLabelProvider extends LabelProvider { + + @Override + public Image getImage(Object element) { + return PlatformUI.getWorkbench().getSharedImages().getImage(SharedImages.IMG_OBJ_PROJECT); + } + + @Override + public String getText(Object element) { + if (!(element instanceof IProject)) { + return null; + } + + return ((IProject) element).getName(); + } + + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java ___________________________________________________________________ Added: svn:mime-type + text/plain