JBoss Tools SVN: r38889 - trunk/requirements/soap.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-02-17 12:44:06 -0500 (Fri, 17 Feb 2012)
New Revision: 38889
Modified:
trunk/requirements/soap/build.properties
Log:
[JBIDE-10953] Adding back in some properties to fix some build/test errors
Modified: trunk/requirements/soap/build.properties
===================================================================
--- trunk/requirements/soap/build.properties 2012-02-17 17:16:17 UTC (rev 38888)
+++ trunk/requirements/soap/build.properties 2012-02-17 17:44:06 UTC (rev 38889)
@@ -5,6 +5,28 @@
soap43.build.archive.md5=91ce2b24015178cda02878d0abe38ac7
soap43.build.archive.root=jboss-soa-p.4.3.0
+#added soap50 and soap51 back in to fix test errors for JBIDE-10953
+soap50.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.0.1/
+soap50.build.name=soa-5.0.1.GA-signed
+soap50.build.archive=${soap50.build.name}.zip
+soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
+soap50.build.archive.root=jboss-soa-p.5.0.0
+
+# JBDS-1374, JBIDE-8055, JBIDE-8403 update SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/soa-5.1....
+# DO NOT USE stuff in http://porkchop.devel.redhat.com/released/JBossSOAP/5.1/5.1.0/ (not sure why different, but different; also no modeshape/teiid jars)
+soap51.build.uri=http://jawa05.englab.brq.redhat.com/released/SOA-5.1.GA/unsigned/
+soap51.build.name=soa-5.1.0.GA
+soap51.build.archive=${soap51.build.name}.zip
+soap51.build.archive.md5=f3cb81c4c7493a6255620d15233a5671
+soap51.build.archive.root=jboss-soa-p.5.1.0
+
+# http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/soa-p-5.2.0.E...
+#soap52.build.uri=http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/
+#soap52.build.name=soa-p-5.2.0.ER6
+#soap52.build.archive=${soap51.build.name}.zip
+#soap52.build.archive.md5=abc110a6e71c0c93713a350dacfcec46
+#soap52.build.archive.root=jboss-soa-p.5.2.0
+
# Added Dec 2 2011 - ldimaggi
soap52.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.2.0/
soap52.build.name=soa-p-5.2.0.GA
12 years, 7 months
JBoss Tools SVN: r38888 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-17 12:16:17 -0500 (Fri, 17 Feb 2012)
New Revision: 38888
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
JBIDE-10787
https://issues.jboss.org/browse/JBIDE-10787
Removed New DS XML wizard from Seam.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-02-17 16:36:36 UTC (rev 38887)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2012-02-17 17:16:17 UTC (rev 38888)
@@ -97,7 +97,7 @@
</selection>
</wizard>
- <wizard
+ <!--wizard
name="New DS XML"
icon="$nl$/icons/seam16.png"
category="org.jboss.tools.seam.ui"
@@ -109,7 +109,7 @@
<selection
class="org.eclipse.core.resources.IResource">
</selection>
- </wizard>
+ </wizard-->
</extension>
<extension
12 years, 7 months
JBoss Tools SVN: r38887 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-17 11:36:36 -0500 (Fri, 17 Feb 2012)
New Revision: 38887
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarArchiverConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
Log:
Organize imports
Modified: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarArchiverConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarArchiverConfigurator.java 2012-02-17 16:27:25 UTC (rev 38886)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/SarArchiverConfigurator.java 2012-02-17 16:36:36 UTC (rev 38887)
@@ -1,9 +1,5 @@
package org.jboss.tools.maven.jbosspackaging.configurators;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.m2e.core.project.IMavenProjectFacade;
public class SarArchiverConfigurator extends JBossPackagingArchiverConfigurator {
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2012-02-17 16:27:25 UTC (rev 38886)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/AbstractMavenConfiguratorTest.java 2012-02-17 16:36:36 UTC (rev 38887)
@@ -15,8 +15,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-02-17 16:27:25 UTC (rev 38886)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JpaConfiguratorTest.java 2012-02-17 16:36:36 UTC (rev 38887)
@@ -7,7 +7,6 @@
import org.eclipse.jpt.jpa.core.JpaProjectManager;
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
12 years, 7 months
JBoss Tools SVN: r38886 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-17 11:27:25 -0500 (Fri, 17 Feb 2012)
New Revision: 38886
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
Log:
Declare the openshift wizard as a project wizard
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-17 16:24:30 UTC (rev 38885)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-17 16:27:25 UTC (rev 38886)
@@ -17,8 +17,9 @@
class="org.jboss.tools.openshift.express.internal.ui.wizard.NewOpenShiftExpressApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard"
- name="OpenShift Express Application">
- <description>Create a new OpenShift Express Application</description>
+ name="OpenShift Express Application"
+ project="true">
+ <description>Create a new OpenShift Express Application</description>
</wizard>
</extension>
<extension
12 years, 7 months
JBoss Tools SVN: r38885 - in trunk: central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-17 11:24:30 -0500 (Fri, 17 Feb 2012)
New Revision: 38885
Added:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/ErrorPage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IWizardContextChangeListener.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/WizardContext.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenProjectConstants.java
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IProjectExamplesWizardPage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java
Log:
JBIDE-10212 : complete "File > New" project wizards
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -876,18 +876,6 @@
showTutorials(categories);
}
- @Deprecated
- //This method should be removed once the EE6 archetypes are wizardified
- private void updateNewProjects(List<ProjectExample> wizardProjects) {
- if (!newProjectsInitialized) {
- if (wizardProjects != null) {
- newProjectsInitialized = true;
- displayTutorialLinks(wizardProjects, projectsComposite, false);
- resize(true);
- }
- }
- }
-
private void showTutorials(Map<ProjectExampleCategory, List<ProjectExample>> categories) {
disposeChildren(tutorialsComposite);
List<ProjectExampleCategory> sortedCategories = new ArrayList<ProjectExampleCategory>(categories.keySet());
@@ -1250,11 +1238,11 @@
//TEMPORARY HACK FOR JBIDE-10053 (Java EE6 archetypes in the project section)
//Should be removed once these archetype tutorials are changed to use wizards as per JBIDE-10264
- RefreshTutorialsJob job = RefreshTutorialsJob.INSTANCE;
- List<ProjectExample> wizardProjects = job.getWizardProjects();
- if (wizardProjects != null){
- updateNewProjects(wizardProjects);
- }
+// RefreshTutorialsJob job = RefreshTutorialsJob.INSTANCE;
+// List<ProjectExample> wizardProjects = job.getWizardProjects();
+// if (wizardProjects != null){
+// updateNewProjects(wizardProjects);
+// }
}
});
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshTutorialsJob.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -21,10 +21,10 @@
import org.eclipse.core.runtime.jobs.Job;
import org.jboss.tools.central.JBossCentralActivator;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
+import org.jboss.tools.project.examples.model.ProjectExample;
import org.jboss.tools.project.examples.model.ProjectExampleCategory;
-import org.jboss.tools.project.examples.model.ProjectExample;
+import org.jboss.tools.project.examples.model.ProjectExampleUtil;
import org.jboss.tools.project.examples.model.ProjectFix;
-import org.jboss.tools.project.examples.model.ProjectExampleUtil;
/**
*
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/AbstractJBossCentralProjectWizard.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -13,6 +13,11 @@
import java.util.List;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.jboss.tools.central.JBossCentralActivator;
import org.jboss.tools.central.jobs.RefreshTutorialsJob;
import org.jboss.tools.project.examples.model.ProjectExample;
import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard2;
@@ -34,10 +39,18 @@
ProjectExample example = null;
RefreshTutorialsJob refreshTutorialsJob = RefreshTutorialsJob.INSTANCE;
List<ProjectExample> wizardProjects = refreshTutorialsJob.getWizardProjects();
+
if (wizardProjects == null || wizardProjects.isEmpty()) {
- //FIXME needs to execute refreshTutorialsJob and wait, gracefully
- //wizardProjects = refreshTutorialsJob.getWizardProjects();
- }
+ RunnableLookup lookup = new RunnableLookup();
+ try {
+ new ProgressMonitorDialog(getShell()).run(true, true, lookup);
+ } catch (Exception e) {
+ JBossCentralActivator.log(e);
+ }
+ wizardProjects = refreshTutorialsJob.getWizardProjects();
+ }
+
+
if (wizardProjects != null) {
for (ProjectExample expl : wizardProjects) {
if (matches(expl)) {
@@ -61,33 +74,29 @@
@Override
public void addPages() {
if (getProjectExample() == null) {
- //TODO add error page
+ //MessageDialog.openError(getShell(), "Wizard Error", "Wizard metadata could not be loaded");
+ addPage(new ErrorPage("Failed to load Wizard", "Wizard metadata could not be loaded"));
} else {
super.addPages();
}
}
- /*
- RunnableLookup lookup = new RunnableLookup(exampleName);
- try {
- new ProgressMonitorDialog(getShell()).run(true, true, lookup);
- } catch (Exception e) {
- JBossCentralActivator.log(e);
- }
-
class RunnableLookup implements IRunnableWithProgress {
- ProjectExample example;
-
public void run(IProgressMonitor monitor) {
- List<ProjectExampleCategory> categories = ProjectExampleUtil.getProjects(monitor);
- for (ProjectExample expl : ProjectExampleUtil.getProjectsByTags(categories, "wizard")) {
- if (matches(expl)) {
- example = expl;
- break;
+ monitor.setTaskName("Refreshing project examples");
+ RefreshTutorialsJob refreshTutorialsJob = RefreshTutorialsJob.INSTANCE;
+ int jobState = refreshTutorialsJob.getState();
+ try {
+ if (jobState == Job.NONE) {
+ refreshTutorialsJob.schedule();
}
+ refreshTutorialsJob.join();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
- */
+
+
}
Added: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/ErrorPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/ErrorPage.java (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/wizards/ErrorPage.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -0,0 +1,33 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.central.wizards;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+
+public class ErrorPage extends WizardPage {
+
+ public ErrorPage(String title, String errorMessage) {
+ super("Error");
+ setTitle(title);
+ setErrorMessage(errorMessage);
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NULL);
+ composite.setLayout(new GridLayout(3, false));
+ setControl(composite);
+ }
+
+}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/configurators/DefaultJBossCentralConfigurator.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -76,7 +76,13 @@
List<String> wizardIds = new ArrayList<String>();
wizardIds.add("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"); //$NON-NLS-1$
wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard"); //$NON-NLS-1$
- return wizardIds;
+ wizardIds.add("org.jboss.tools.central.wizards.NewJavaeeWarProjectWizard"); //$NON-NLS-1$
+ wizardIds.add("org.jboss.tools.central.wizards.NewJavaeeEarProjectWizard"); //$NON-NLS-1$
+ wizardIds.add("org.jboss.tools.central.wizards.NewHtml5ProjectWizard"); //$NON-NLS-1$
+ wizardIds.add("org.jboss.tools.central.wizards.NewRichfacesProjectWizard"); //$NON-NLS-1$
+ wizardIds.add("org.jboss.tools.central.wizards.NewSpringMvcProjectWizard"); //$NON-NLS-1$
+ wizardIds.add("org.jboss.tools.central.wizards.NewGwtProjectWizard"); //$NON-NLS-1$
+ return wizardIds;
}
@Override
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IProjectExamplesWizardPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IProjectExamplesWizardPage.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IProjectExamplesWizardPage.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -5,7 +5,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.jboss.tools.project.examples.model.ProjectExample;
-public interface IProjectExamplesWizardPage extends IWizardPage {
+public interface IProjectExamplesWizardPage extends IWizardPage, IWizardContextChangeListener {
boolean finishPage();
@@ -14,4 +14,6 @@
void setProjectExample(ProjectExample projectExample);
Map<String, Object> getPropertiesMap();
+
+ void setWizardContext(WizardContext context);
}
Added: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IWizardContextChangeListener.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IWizardContextChangeListener.java (rev 0)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/IWizardContextChangeListener.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -0,0 +1,16 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.project.examples.wizard;
+
+public interface IWizardContextChangeListener {
+
+ void onWizardContextChange(String key, Object value);
+}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -49,6 +49,8 @@
List<IProjectExamplesWizardPage> contributedPages = new LinkedList<IProjectExamplesWizardPage>();
private ProjectExample projectExample;
+ private WizardContext wizardContext = new WizardContext();
+
private boolean isCentral = false;
//private QuickFixPage quickFixPage;
@@ -214,7 +216,7 @@
if (projectExample != null) {
return projectExample;
}
- return mainPage.getSelectedProject();
+ return (mainPage == null)?null:mainPage.getSelectedProject();
}
// public IWizardPage getReadyPage() {
@@ -259,5 +261,14 @@
public ProjectExample getProjectExample() {
return projectExample;
}
-
+
+ @Override
+ public void addPage(IWizardPage page) {
+ if (page instanceof IProjectExamplesWizardPage) {
+ IProjectExamplesWizardPage ewp = (IProjectExamplesWizardPage)page;
+ ewp.setWizardContext(wizardContext);
+ wizardContext.addListener(ewp);
+ }
+ super.addPage(page);
+ }
}
Added: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/WizardContext.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/WizardContext.java (rev 0)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/WizardContext.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -0,0 +1,55 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.project.examples.wizard;
+
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class WizardContext {
+
+ private Map<String, Object> context;
+
+ private Set<IWizardContextChangeListener> listeners;
+
+ public WizardContext() {
+ context = new HashMap<String, Object>();
+ listeners = new LinkedHashSet<IWizardContextChangeListener>();
+ }
+
+ public void addListener(IWizardContextChangeListener newListener) {
+ listeners.add(newListener);
+ }
+
+ public void removeListener(IWizardContextChangeListener listener) {
+ listeners.remove(listener);
+ }
+
+ public void setProperty(String key, Object value) {
+ Object previousValue = context.get(key);
+ if ((previousValue != null && !previousValue.equals(value))
+ || (previousValue == null && value != null)) {
+ context.put(key, value);
+ fireChangeEvent(key, value);
+ }
+ }
+
+ public void getProperty(String key) {
+ context.get(key);
+ }
+
+ private void fireChangeEvent(String key, Object value) {
+ for (IWizardContextChangeListener listener : listeners) {
+ listener.onWizardContextChange(key, value);
+ }
+ }
+}
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -63,6 +63,7 @@
import org.jboss.tools.project.examples.model.ProjectExample;
import org.jboss.tools.project.examples.wizard.IProjectExamplesWizardPage;
import org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard2;
+import org.jboss.tools.project.examples.wizard.WizardContext;
/**
* Simplified UI for the Maven Archetype Wizard, based off the original m2e MavenProjectWizardLocationPage.
@@ -82,11 +83,9 @@
private Composite warningLink;
private boolean initialized;
private Boolean isEnterpriseRepoAvailable;
- private ModifyListener projectNameModifyListener;
- private ModifyListener packageNameModifyListener;
- private ModifyListener propertyModifyListener;
private ProjectExample projectDescription;
private ProjectExample projectExample;
+ private WizardContext context;
public ArchetypeExamplesWizardFirstPage() {
super(new ProjectImportConfiguration(), "", "",new ArrayList<IWorkingSet>());
@@ -98,7 +97,6 @@
super(configuration, projectDescription.getShortDescription(),Messages.ArchetypeExamplesWizardFirstPage_Title, workingSet);
this.projectDescription = projectDescription;
setPageComplete(false);
-
}
@Override
@@ -113,12 +111,12 @@
projectNameCombo.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
+ if (isCurrentPage()) {
+ context.setProperty(MavenProjectConstants.PROJECT_NAME, getProjectName());
+ }
validate();
}
});
- if (projectNameModifyListener != null) {
- projectNameCombo.addModifyListener(projectNameModifyListener);
- }
packageLabel = new Label(container, SWT.NONE);
packageLabel.setText(Messages.ArchetypeExamplesWizardFirstPage_Package_Label);
@@ -129,12 +127,12 @@
packageCombo.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
+ if (isCurrentPage()) {
+ context.setProperty(MavenProjectConstants.PACKAGE, packageCombo.getText());
+ }
validate();
}
});
- if (packageNameModifyListener != null) {
- packageCombo.addModifyListener(packageNameModifyListener);
- }
//TODO read facet version from project example metadata
IProjectFacetVersion facetVersion;
@@ -145,10 +143,6 @@
} catch (CoreException e) {
e.printStackTrace();
}
- if (propertyModifyListener != null) {
- serverTargetCombo.addModifyListener(propertyModifyListener);
- }
-
Label emptyLabel = new Label(container, SWT.NONE);
emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,
@@ -188,15 +182,19 @@
}
}
- serverTargetCombo.select(selectedRuntimeIdx);
-
serverTargetCombo.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
+ if (isCurrentPage()) {
+ context.setProperty(MavenProjectConstants.ENTERPRISE_TARGET, isEnterpriseTargetRuntime());
+ }
validateEnterpriseRepo();
}
});
+ if (selectedRuntimeIdx > 0) {
+ serverTargetCombo.select(selectedRuntimeIdx);
+ }
}
@@ -254,8 +252,11 @@
}
protected void validateEnterpriseRepo() {
+
boolean isWarningLinkVisible = (isEnterpriseTargetRuntime() && !assertEnterpriseRepoAccessible());
- warningLink.setVisible(isWarningLinkVisible);
+ if (warningLink != null) {
+ warningLink.setVisible(isWarningLinkVisible);
+ }
}
@@ -301,6 +302,10 @@
if (packageName != null) {
packageCombo.setText(packageName);
}
+
+ //Force setting of enterprise value
+ context.setProperty(MavenProjectConstants.ENTERPRISE_TARGET, isEnterpriseTargetRuntime());
+
initialized = true;
validate();
}
@@ -341,11 +346,9 @@
private boolean assertEnterpriseRepoAccessible() {
- if (isEnterpriseRepoAvailable != null) {
- return isEnterpriseRepoAvailable.booleanValue();
+ if (isEnterpriseRepoAvailable == null) {
+ isEnterpriseRepoAvailable = MavenArtifactHelper.isEnterpriseRepositoryAvailable();
}
-
- isEnterpriseRepoAvailable = MavenArtifactHelper.isEnterpriseRepositoryAvailable();
return isEnterpriseRepoAvailable.booleanValue();
}
@@ -368,30 +371,7 @@
return runtimesMap;
}
- public ModifyListener getProjectNameModifyListener() {
- return projectNameModifyListener;
- }
- public void setProjectNameModifyListener(ModifyListener projectNameModifyListener) {
- this.projectNameModifyListener = projectNameModifyListener;
- }
-
- public ModifyListener getPackageNameModifyListener() {
- return packageNameModifyListener;
- }
-
- public void setPackageNameModifyListener(ModifyListener packageNameModifyListener) {
- this.packageNameModifyListener = packageNameModifyListener;
- }
-
- public ModifyListener getPropertyModifyListener() {
- return propertyModifyListener;
- }
-
- public void setPropertyModifyListener(ModifyListener propertyModifyListener) {
- this.propertyModifyListener = propertyModifyListener;
- }
-
public void setUseDefaultWorkspaceLocation(boolean value) {
Class clazz = MavenProjectWizardLocationPage.class;
try {
@@ -486,5 +466,37 @@
return null;
}
+ @Override
+ public void onWizardContextChange(String key, Object value) {
+ if (MavenProjectConstants.PROJECT_NAME.equals(key)) {
+ String artifactId = value == null?"":value.toString();
+ setProjectName(artifactId);
+ } else if (MavenProjectConstants.PACKAGE.equals(key)){
+ String packageName = value == null?"":value.toString();
+ setPackageName(packageName);
+ }
+ }
+
+ public void setProjectName(String projectName) {
+ if (projectNameCombo != null && !projectNameCombo.getText().equals(projectName)) {
+ projectNameCombo.setText(projectName);
+ }
+ }
+
+ public void setPackageName(String packageName) {
+ if (packageCombo != null) {
+ if (!packageCombo.getText().equals(packageName)){
+ packageCombo.setText(packageName);
+ }
+ }
+ }
+
+
+ @Override
+ public void setWizardContext(WizardContext context) {
+ this.context = context;
+ }
+
+
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2012-02-17 16:15:18 UTC (rev 38884)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -51,6 +51,8 @@
import org.eclipse.m2e.core.ui.internal.Messages;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -66,6 +68,7 @@
import org.jboss.tools.project.examples.model.ArchetypeModel;
import org.jboss.tools.project.examples.model.ProjectExample;
import org.jboss.tools.project.examples.wizard.IProjectExamplesWizardPage;
+import org.jboss.tools.project.examples.wizard.WizardContext;
/**
*
@@ -81,6 +84,7 @@
private ProjectExample projectExample;
private boolean initialized = false;
private Map<String, Object> propertiesMap = new HashMap<String, Object>();
+ private WizardContext context;
public ArchetypeExamplesWizardPage() {
super(new ProjectImportConfiguration());
@@ -96,6 +100,24 @@
@Override
public void createControl(Composite parent) {
super.createControl(parent);
+ packageCombo.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ if (isCurrentPage()) {
+ context.setProperty(MavenProjectConstants.PACKAGE, packageCombo.getText());
+ }
+ }
+ });
+ artifactIdCombo.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ if (isCurrentPage()) {
+ context.setProperty(MavenProjectConstants.PROJECT_NAME, artifactIdCombo.getText());
+ }
+ validate();
+ }
+ });
+
if (projectExample != null && !initialized) {
initialize();
}
@@ -106,8 +128,6 @@
Archetype archetype = new Archetype();
ArchetypeModel archetypeModel = projectDescription.getArchetypeModel();
- final String version = archetypeModel.getVersion();
-
archetype.setGroupId(archetypeModel.getArchetypeGroupId());
archetype.setArtifactId(archetypeModel.getArchetypeArtifactId());
archetype.setVersion(archetypeModel.getArchetypeVersion());
@@ -284,9 +304,10 @@
}
}
}
-
+
+
public void setArtifactId(String projectName) {
- if (artifactIdCombo != null) {
+ if (artifactIdCombo != null && !artifactIdCombo.getText().equals(projectName)) {
artifactIdCombo.setText(projectName);
}
}
@@ -296,8 +317,10 @@
if (!packageCombo.getText().equals(packageName)){
packageCombo.setText(packageName);
}
- if (!groupIdCombo.getText().equals(packageName)){
- groupIdCombo.setText(packageName);
+ if (!isCurrentPage()) {
+ if (!groupIdCombo.getText().equals(packageName)){
+ groupIdCombo.setText(packageName);
+ }
}
}
}
@@ -486,4 +509,24 @@
return propertiesMap ;
}
+ @Override
+ public void onWizardContextChange(String key, Object value) {
+ if (MavenProjectConstants.PROJECT_NAME.equals(key)) {
+ String artifactId = value == null?"":value.toString();
+ setArtifactId(artifactId);
+ } else if (MavenProjectConstants.PACKAGE.equals(key)){
+ String packageName = value == null?"":value.toString();
+ setPackageName(packageName);
+ } else if (MavenProjectConstants.ENTERPRISE_TARGET.equals(key)) {
+ //Make sure it's a boolean :
+ Boolean enterprise = Boolean.parseBoolean(value.toString());
+ updateArchetypeProperty("enterprise", enterprise.toString());
+ }
+ }
+
+ @Override
+ public void setWizardContext(WizardContext context) {
+ this.context = context;
+ }
+
}
Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenProjectConstants.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenProjectConstants.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenProjectConstants.java 2012-02-17 16:24:30 UTC (rev 38885)
@@ -0,0 +1,13 @@
+package org.jboss.tools.maven.project.examples.wizard;
+
+public final class MavenProjectConstants {
+
+ public final static String PROJECT_NAME = "projectName";
+
+ public final static String PACKAGE = "package";
+
+ public final static String ENTERPRISE_TARGET = "enterprise";
+
+ private MavenProjectConstants(){
+ }
+}
12 years, 7 months
JBoss Tools SVN: r38884 - in trunk: download.jboss.org/jbosstools/builds/cascade and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 11:15:18 -0500 (Fri, 17 Feb 2012)
New Revision: 38884
Modified:
trunk/build/pom-core.xml
trunk/build/pom.xml
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
central now depends on maven
Modified: trunk/build/pom-core.xml
===================================================================
--- trunk/build/pom-core.xml 2012-02-17 15:09:43 UTC (rev 38883)
+++ trunk/build/pom-core.xml 2012-02-17 16:15:18 UTC (rev 38884)
@@ -592,6 +592,7 @@
<module>../esb</module>
<module>../jbpm</module>
<module>../flow</module>
+ <module>../maven</module>
<module>../central</module>
</modules>
</profile>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-02-17 15:09:43 UTC (rev 38883)
+++ trunk/build/pom.xml 2012-02-17 16:15:18 UTC (rev 38884)
@@ -712,6 +712,7 @@
<module>../esb</module>
<module>../jbpm</module>
<module>../flow</module>
+ <module>../maven</module>
<module>../central</module>
</modules>
</profile>
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 15:09:43 UTC (rev 38883)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 16:15:18 UTC (rev 38884)
@@ -39,7 +39,7 @@
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
-central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests
+central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests, maven
runtime -> common, tests, jmx
esb -> as, jst, common, tests
cdi -> jst
12 years, 7 months
JBoss Tools SVN: r38883 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-17 10:09:43 -0500 (Fri, 17 Feb 2012)
New Revision: 38883
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
Log:
[JBIDE-10922] corrected layout
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-17 15:04:21 UTC (rev 38882)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-17 15:09:43 UTC (rev 38883)
@@ -55,16 +55,16 @@
import com.openshift.express.client.OpenShiftException;
public class ExpressDetailsComposite {
- public static ExpressDetailsComposite createComposite(Composite parent,
+ public static ExpressDetailsComposite createComposite(Composite parent,
IServerModeUICallback callback, String mode, boolean showVerify) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout(2, false));
return new ExpressDetailsComposite(composite, callback, mode, showVerify);
}
-
+
protected IServerModeUICallback callback;
- private ModifyListener nameModifyListener, remoteModifyListener,
- appModifyListener, deployProjectModifyListener;
+ private ModifyListener nameModifyListener, remoteModifyListener,
+ appModifyListener, deployProjectModifyListener;
private ModifyListener passModifyListener;
private Link importLink;
protected Text userText, remoteText;
@@ -80,6 +80,7 @@
private String error;
private IServerWorkingCopy server;
private String mode;
+
public ExpressDetailsComposite(Composite fill, IServerModeUICallback callback, String mode, boolean showVerify) {
this.callback = callback;
this.server = callback.getServer();
@@ -91,100 +92,119 @@
fillWidgets();
addListeners();
}
-
+
public Composite getComposite() {
return composite;
}
-
+
private void initModel() {
String nameFromExistingServer = ExpressServerUtils.getExpressUsername(server);
- if( nameFromExistingServer == null ) {
+ if (nameFromExistingServer == null) {
// We're in a new server wizard.
// First, check if the taskmodel has data
- IUser tmpUser = (IUser)callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_USER);
- if( tmpUser == null ) {
+ IUser tmpUser = (IUser) callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_USER);
+ if (tmpUser == null) {
// If not, use recent user
tmpUser = UserModel.getDefault().getRecentUser();
}
- if( tmpUser == null && UserModel.getDefault().getUsers().length > 0 ) {
+ if (tmpUser == null && UserModel.getDefault().getUsers().length > 0) {
tmpUser = UserModel.getDefault().getUsers()[0];
}
- if( tmpUser != null ) {
+ if (tmpUser != null) {
try {
this.fuser = tmpUser;
this.user = tmpUser.getRhlogin();
List<IApplication> allApps = tmpUser.getApplications();
this.appListNames = getAppNamesAsStrings(allApps);
- } catch(Exception e) { /* ignore */ }
- }
+ } catch (Exception e) { /* ignore */
+ }
+ }
} else {
this.user = nameFromExistingServer;
}
- IApplication app = (IApplication)callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP);
- if( app != null ) {
+ IApplication app = (IApplication) callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP);
+ if (app != null) {
this.fapplication = app;
this.app = app.getName();
}
-
+
this.pass = UserModel.getDefault().getPasswordFromSecureStorage(this.user);
this.remote = ExpressServerUtils.getExpressRemoteName(server);
this.remote = this.remote == null ? IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT : this.remote;
}
-
+
/* Set widgets initial values */
private void fillWidgets() {
- if( user != null ) userText.setText(user);
- if( pass != null ) passText.setText(pass);
- if( remote != null ) remoteText.setText(remote);
- if( appListNames != null ) appNameCombo.setItems(appListNames);
- if( app != null ) {
+ if (user != null)
+ userText.setText(user);
+ if (pass != null)
+ passText.setText(pass);
+ if (remote != null)
+ remoteText.setText(remote);
+ if (appListNames != null)
+ appNameCombo.setItems(appListNames);
+ if (app != null) {
int ind = appNameCombo.indexOf(app);
- if( ind != -1 ) {
+ if (ind != -1) {
appNameCombo.select(ind);
}
}
remoteText.setText(remote);
}
-
+
private void createWidgets(Composite composite) {
composite.setLayout(new GridLayout(2, false));
Label userLabel = new Label(composite, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(userLabel);
userText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(userText);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(userText);
Label passLabel = new Label(composite, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(passLabel);
passText = new Text(composite, SWT.PASSWORD | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText);
-
- if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) {
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(passText);
+
+ if (mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE)) {
Label appNameLabel = new Label(composite, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(appNameLabel);
appNameCombo = new Combo(composite, SWT.NONE);
- appNameLabel.setText("Application Name: " );
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(appNameCombo);
+ appNameLabel.setText("Application Name: ");
String aName = ExpressServerUtils.getExpressApplicationName(server);
- if( aName != null ) appNameCombo.setText(aName);
- if( aName != null ) appNameCombo.setEnabled(false);
- }
-// else {
-// Label deployLocationLabel = new Label(composite, SWT.NONE);
-// deployProjectCombo = new Combo(composite, SWT.NONE);
-// deployLocationLabel.setText("Openshift Project: " );
-// String[] projectNames = discoverOpenshiftProjects();
-// deployProjectCombo.setItems(projectNames);
-// String depLoc = ExpressServerUtils.getExpressDeployProject(server);
-// if( depLoc != null ) deployProjectCombo.setText(depLoc);
-// if( depLoc != null ) deployProjectCombo.setEnabled(false);
-// }
-
+ if (aName != null)
+ appNameCombo.setText(aName);
+ if (aName != null)
+ appNameCombo.setEnabled(false);
+ }
+ // else {
+ // Label deployLocationLabel = new Label(composite, SWT.NONE);
+ // deployProjectCombo = new Combo(composite, SWT.NONE);
+ // deployLocationLabel.setText("Openshift Project: " );
+ // String[] projectNames = discoverOpenshiftProjects();
+ // deployProjectCombo.setItems(projectNames);
+ // String depLoc = ExpressServerUtils.getExpressDeployProject(server);
+ // if( depLoc != null ) deployProjectCombo.setText(depLoc);
+ // if( depLoc != null ) deployProjectCombo.setEnabled(false);
+ // }
+
Label remoteLabel = new Label(composite, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(remoteLabel);
remoteText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(remoteText);
-
-
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(remoteText);
+
// Text
userLabel.setText("Username: ");
passLabel.setText("Password: ");
remoteLabel.setText("Remote: ");
-
- if( showVerify ) {
+
+ if (showVerify) {
importLink = new Link(composite, SWT.DEFAULT);
importLink.setText("<a>Import this application</a>"); //$NON-NLS-1$
importLink.setEnabled(false);
@@ -194,22 +214,22 @@
verifyButton.setText("Verify...");
}
}
-
+
private void addListeners() {
nameModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
user = userText.getText();
String storedPass = UserModel.getDefault().getPasswordFromSecureStorage(user);
- if( storedPass != null && !storedPass.equals(""))
+ if (storedPass != null && !storedPass.equals(""))
passText.setText(storedPass);
callback.execute(new SetUserCommand(server));
}
};
userText.addModifyListener(nameModifyListener);
-
+
passModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
- //pass = passText.getText();
+ // pass = passText.getText();
callback.execute(new SetPassCommand(server));
}
};
@@ -223,7 +243,7 @@
};
remoteText.addModifyListener(remoteModifyListener);
- if( appNameCombo != null ) {
+ if (appNameCombo != null) {
appModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
app = appNameCombo.getText();
@@ -231,9 +251,9 @@
}
};
appNameCombo.addModifyListener(appModifyListener);
- }
+ }
- if( deployProjectCombo != null ) {
+ if (deployProjectCombo != null) {
deployProjectModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
deployProject = deployProjectCombo.getText();
@@ -241,9 +261,9 @@
}
};
deployProjectCombo.addModifyListener(deployProjectModifyListener);
- }
+ }
- if( verifyButton != null ) {
+ if (verifyButton != null) {
importLink.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
OpenShiftExpressApplicationWizard wizard = new ImportOpenShiftExpressApplicationWizard();
@@ -253,6 +273,7 @@
dialog.create();
dialog.open();
}
+
public void widgetDefaultSelected(SelectionEvent e) {
}
});
@@ -261,12 +282,13 @@
public void widgetSelected(SelectionEvent e) {
verifyPressed();
}
+
public void widgetDefaultSelected(SelectionEvent e) {
}
});
}
}
-
+
private void verifyPressed() {
final CredentialsWizardPageModel model = new CredentialsWizardPageModel(new ConnectToOpenShiftWizardModel());
this.fapplication = null;
@@ -285,22 +307,22 @@
callback.executeLongRunning(j);
postLongRunningValidate();
}
-
+
private void postLongRunningValidate() {
importLink.setEnabled(true);
- if( appListNames == null ) {
+ if (appListNames == null) {
appListNames = new String[0];
}
- if( appNameCombo != null ) {
+ if (appNameCombo != null) {
int index = Arrays.asList(appListNames).indexOf(app);
appNameCombo.setItems(appListNames);
- if( index != -1 )
+ if (index != -1)
appNameCombo.select(index);
}
- if( error == null ) {
+ if (error == null) {
IProject p = ExpressServerUtils.findProjectForApplication(fapplication);
- if( p == null ) {
- error = "Your workspace does not have a project corresponding to " + app +". Please import one.";
+ if (p == null) {
+ error = "Your workspace does not have a project corresponding to " + app + ". Please import one.";
importLink.setEnabled(true);
}
}
@@ -308,46 +330,45 @@
verifyButton.setEnabled(true);
}
-
public class SetUserCommand extends ServerWorkingCopyPropertyCommand {
public SetUserCommand(IServerWorkingCopy server) {
- super(server, Messages.EditorChangeUsernameCommandName, userText, userText.getText(),
+ super(server, Messages.EditorChangeUsernameCommandName, userText, userText.getText(),
ExpressServerUtils.ATTRIBUTE_USERNAME, nameModifyListener);
}
}
public class SetRemoteCommand extends ServerWorkingCopyPropertyCommand {
public SetRemoteCommand(IServerWorkingCopy server) {
- super(server, "Change Remote Name", remoteText, remoteText.getText(),
+ super(server, "Change Remote Name", remoteText, remoteText.getText(),
ExpressServerUtils.ATTRIBUTE_REMOTE_NAME, remoteModifyListener);
}
}
public class SetApplicationCommand extends ServerWorkingCopyPropertyComboCommand {
public SetApplicationCommand(IServerWorkingCopy server) {
- super(server, "Change Application Name", appNameCombo, appNameCombo.getText(),
+ super(server, "Change Application Name", appNameCombo, appNameCombo.getText(),
ExpressServerUtils.ATTRIBUTE_APPLICATION_NAME, appModifyListener);
}
}
public class SetDeployProjectCommand extends ServerWorkingCopyPropertyComboCommand {
public SetDeployProjectCommand(IServerWorkingCopy server) {
- super(server, "Change Deployment Project", appNameCombo, deployProjectCombo.getText(),
+ super(server, "Change Deployment Project", appNameCombo, deployProjectCombo.getText(),
ExpressServerUtils.ATTRIBUTE_DEPLOY_PROJECT, deployProjectModifyListener);
}
}
public class SetPassCommand extends ServerWorkingCopyPropertyCommand {
public SetPassCommand(IServerWorkingCopy server) {
- super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
+ super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
null, passModifyListener);
oldVal = passText.getText();
}
-
+
public void execute() {
pass = newVal;
}
-
+
public void undo() {
pass = oldVal;
text.removeModifyListener(listener);
@@ -360,11 +381,11 @@
return new Runnable() {
public void run() {
final IStatus s = model.validateCredentials();
- if( !s.isOK() ) {
+ if (!s.isOK()) {
ExpressDetailsComposite.this.error = "Credentials Failed";
} else {
-
- if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) {
+
+ if (mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE)) {
verifyApplicationSourceMode(model);
} else {
verifyApplicationBinaryMode(model);
@@ -373,37 +394,36 @@
}
};
}
-
-
private void verifyApplicationBinaryMode(CredentialsWizardPageModel model) {
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(deployProject);
try {
fuser = UserModel.getDefault().getRecentUser();
final List<IApplication> allApps = fuser.getApplications();
fapplication = ExpressServerUtils.findApplicationForProject(p, allApps);
-
- if( fapplication == null ) {
+
+ if (fapplication == null) {
error = "Application for project \"" + p.getName() + "\" not found";
}
- IServerWorkingCopy wc = callback.getServer();
+ IServerWorkingCopy wc = callback.getServer();
ExpressServerUtils.fillServerWithOpenShiftDetails(wc, fapplication, fuser,
mode, remote);
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
wc.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
- wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
- } catch( OpenShiftException ce ) {
-
- } catch( CoreException ce) {
-
+ wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation()
+ .toString());
+ } catch (OpenShiftException ce) {
+
+ } catch (CoreException ce) {
+
}
}
-
+
private void verifyApplicationSourceMode(CredentialsWizardPageModel model) {
error = null;
// now check the app name and cartridge
- String[] appNames = new String[]{};
+ String[] appNames = new String[] {};
try {
IUser user = UserModel.getDefault().getRecentUser();
final List<IApplication> allApps = user.getApplications();
@@ -411,7 +431,7 @@
int index = Arrays.asList(appNames).indexOf(app);
IApplication application = index == -1 ? null : allApps.get(index);
ExpressDetailsComposite.this.appListNames = appNames;
- if( application == null ) {
+ if (application == null) {
error = "Application " + app + " not found";
} else {
// Fill with new data
@@ -419,31 +439,31 @@
ExpressDetailsComposite.this.fapplication = application;
ExpressDetailsComposite.this.fuser = user;
IProject p = ExpressServerUtils.findProjectForApplication(fapplication);
-
- // update the values
- IServerWorkingCopy wc = callback.getServer();
+
+ // update the values
+ IServerWorkingCopy wc = callback.getServer();
ExpressServerUtils.fillServerWithOpenShiftDetails(wc, application, fuser,
mode, remote);
wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_CUSTOM);
wc.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
- if( p != null ) {
- wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
- wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation().toString());
+ if (p != null) {
+ wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, p.getFolder("deployments").getLocation()
+ .toString());
+ wc.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, p.getFolder("deployments")
+ .getLocation().toString());
}
- } catch(CoreException ce) {
+ } catch (CoreException ce) {
// TODO FIX HANDLE
}
}
- } catch(OpenShiftException ose) {
+ } catch (OpenShiftException ose) {
error = "Application \"" + app + "\" not found: " + ose.getMessage();
}
}
-
-
private String[] getAppNamesAsStrings(List<IApplication> allApps) {
String[] appNames = new String[allApps.size()];
- for( int i = 0; i < allApps.size(); i++ ) {
+ for (int i = 0; i < allApps.size(); i++) {
appNames[i] = allApps.get(i).getName();
}
return appNames;
@@ -452,11 +472,11 @@
public String getUsername() {
return user;
}
-
+
public String getPassword() {
return pass;
}
-
+
public String getApplicationName() {
return app;
}
@@ -464,11 +484,11 @@
public IUser getUser() {
return fuser;
}
-
+
public IApplication getApplication() {
return fapplication;
}
-
+
public String getRemote() {
return remote;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-17 15:04:21 UTC (rev 38882)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-02-17 15:09:43 UTC (rev 38883)
@@ -37,7 +37,7 @@
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
section.setText("Express Server in Source Mode (Details)");
- section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
+ section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL| GridData.GRAB_VERTICAL));
details = ExpressDetailsComposite.createComposite(section, createCallback(), ExpressServerUtils.EXPRESS_SOURCE_MODE, false);
toolkit.paintBordersFor(details.getComposite());
12 years, 7 months
JBoss Tools SVN: r38882 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: viewer/actionProvider and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-17 10:04:21 -0500 (Fri, 17 Feb 2012)
New Revision: 38882
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java
Log:
Fixed - OpenShift console: can select multiple apps but then only 1 gets deleted. List is not refreshed.
https://issues.jboss.org/browse/JBIDE-10812
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-02-17 15:04:03 UTC (rev 38881)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-02-17 15:04:21 UTC (rev 38882)
@@ -5,6 +5,7 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.ui.navigator.CommonViewer;
public abstract class AbstractAction extends Action implements ISelectionChangedListener {
@@ -12,7 +13,7 @@
/** The current selection in the view. */
protected ISelection selection = null;
- protected CommonViewer viewer;
+ protected StructuredViewer viewer;
public AbstractAction(String text) {
super(text);
@@ -36,4 +37,8 @@
}
+ public void setViewer(StructuredViewer viewer) {
+ this.viewer = viewer;
+ }
+
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-02-17 15:04:03 UTC (rev 38881)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-02-17 15:04:21 UTC (rev 38882)
@@ -1,8 +1,10 @@
package org.jboss.tools.openshift.express.internal.ui.action;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -14,10 +16,10 @@
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
-import org.jboss.tools.openshift.express.internal.ui.utils.DisposeUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
public class DeleteApplicationAction extends AbstractAction {
@@ -32,9 +34,8 @@
}
/**
- * Operation called when the user clicks on 'Show In>Remote Console'. If no
- * Console/Worker existed, a new one is created, otherwise, it is displayed.
- * {@inheritDoc}
+ * Operation called when the user clicks on 'Show In>Remote Console'. If no Console/Worker existed, a new one is
+ * created, otherwise, it is displayed. {@inheritDoc}
*/
@Override
public void run() {
@@ -60,45 +61,43 @@
+ "This is NOT reversible, all remote data for those applications will be removed.");
}
if (confirm) {
- for (final IApplication application : appsToDelete) {
- final String appName = application.getName();
- Job job = new Job("Deleting application '" + appName + "'...") {
- protected IStatus run(IProgressMonitor monitor) {
- try {
- application.destroy();
- } catch (OpenShiftException e) {
- Logger.error("Failed to delete application '" + appName + "'", e);
- } finally {
- monitor.done();
- if (viewer != null) {
- refresh();
+ // rework here... loop inside the job, refresh required users only. Equals() and hashcode() in IUser ?
+ Job job = new Job("Deleting OpenShift Application(s)...") {
+ protected IStatus run(IProgressMonitor monitor) {
+ Set<String> usersToRefresh = new HashSet<String>();
+ try {
+ for (final IApplication application : appsToDelete) {
+ final String appName = application.getName();
+ try {
+ application.destroy();
+ usersToRefresh.add(application.getUser().getRhlogin());
+ } catch (OpenShiftException e) {
+ Logger.error("Failed to delete application '" + appName + "'", e);
}
}
- return Status.OK_STATUS;
+ } finally {
+ monitor.done();
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ if (viewer != null) {
+ //viewer.g
+ viewer.refresh();
+ }
+ }
+ });
}
- };
- job.setPriority(Job.SHORT);
- job.schedule(); // start as soon as possible
- }
+
+ return Status.OK_STATUS;
+ }
+ };
+ job.setPriority(Job.SHORT);
+ job.schedule(); // start as soon as possible
}
- if (viewer != null) {
- refresh();
- }
}
private boolean isApplication(Object selection) {
return selection instanceof IApplication;
}
- private void refresh() {
- if (!DisposeUtils.isDisposed(viewer))
- viewer.getControl().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- viewer.refresh();
- }
- });
- }
-
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-02-17 15:04:03 UTC (rev 38881)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-02-17 15:04:21 UTC (rev 38882)
@@ -35,6 +35,7 @@
super.init(actionExtensionSite);
ICommonViewerSite site = actionExtensionSite.getViewSite();
if (site instanceof ICommonViewerWorkbenchSite) {
+ action.setViewer(actionExtensionSite.getStructuredViewer());
action.setSelection(actionExtensionSite.getStructuredViewer().getSelection());
actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action);
}
12 years, 7 months
JBoss Tools SVN: r38881 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-17 10:04:03 -0500 (Fri, 17 Feb 2012)
New Revision: 38881
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
Typo
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-17 15:03:47 UTC (rev 38880)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-17 15:04:03 UTC (rev 38881)
@@ -105,7 +105,7 @@
ValueBindingBuilder.bind(repoPathObservable).to(repoPathModelObservable).in(dbc);
Button browseRepoPathButton = new Button(cloneGroup, SWT.PUSH);
- browseRepoPathButton.setText("Browse");
+ browseRepoPathButton.setText("Browse...");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseRepoPathButton);
browseRepoPathButton.addSelectionListener(onRepoPath());
12 years, 7 months
JBoss Tools SVN: r38880 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-17 10:03:47 -0500 (Fri, 17 Feb 2012)
New Revision: 38880
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
Log:
Typo
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-17 15:03:27 UTC (rev 38879)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-17 15:03:47 UTC (rev 38880)
@@ -55,7 +55,7 @@
public static final String PREF_CONTENTASSISTKEY = "prefContentAssistKey";
- private static final String PAGE_TITLE_FORMAT = "Setup Project for OpenShift application \"{0}\"";
+ private static final String PAGE_TITLE_FORMAT = "Setup Project for OpenShift Application \"{0}\"";
private ProjectAndServerAdapterSettingsWizardPageModel pageModel;
private Text existingProjectNameText = null;
12 years, 7 months