diff options
author | Doug Schaefer | 2017-10-05 00:47:32 +0000 |
---|---|---|
committer | Doug Schaefer | 2017-10-06 20:36:51 +0000 |
commit | 11dcec43f211e694b0c8f811be37f34868a4cdf0 (patch) | |
tree | 8193e40cdce02c23518368667008d99488d7bf02 /build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal | |
parent | cfd6e9867ede236878072ed630478685fd43cba0 (diff) | |
download | org.eclipse.cdt-11dcec43f211e694b0c8f811be37f34868a4cdf0.tar.gz org.eclipse.cdt-11dcec43f211e694b0c8f811be37f34868a4cdf0.tar.xz org.eclipse.cdt-11dcec43f211e694b0c8f811be37f34868a4cdf0.zip |
Add UI tests plugin for CMake. Fix a couple of bugs it found.
Also restructures the pom.xmls to put the modules in the top level
so we can order them to have the test plugins build after them.
Change-Id: I2f0e4ebd252791fb8844cdf0f635d574946207aa
Diffstat (limited to 'build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal')
-rw-r--r-- | build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java | 7 | ||||
-rw-r--r-- | build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java | 13 | ||||
-rw-r--r-- | build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java | 11 | ||||
-rw-r--r-- | build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties (renamed from build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.properties) | 3 |
4 files changed, 31 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java index 7778df8d84b..6cc9a02e012 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/CMakeBuildTab.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2017 QNX Software Systems 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 + *******************************************************************************/ package org.eclipse.cdt.cmake.ui.internal; import java.util.HashMap; diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java index cffd11d7158..50df2366fab 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.java @@ -1,3 +1,10 @@ +/******************************************************************************* + * Copyright (c) 2017 QNX Software Systems 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 + *******************************************************************************/ package org.eclipse.cdt.cmake.ui.internal; import org.eclipse.osgi.util.NLS; @@ -15,9 +22,13 @@ public class Messages extends NLS { public static String CMakePropertyPage_FailedToStartCMakeGui_Title; public static String CMakePropertyPage_LaunchCMakeGui; + public static String NewCMakeProjectWizard_Description; + public static String NewCMakeProjectWizard_PageTitle; + public static String NewCMakeProjectWizard_WindowTitle; + static { // initialize resource bundle - NLS.initializeMessages(Messages.class.getName(), Messages.class); + NLS.initializeMessages("org.eclipse.cdt.cmake.ui.internal.messages", Messages.class); //$NON-NLS-1$ } private Messages() { diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java index ad732e9e859..39f9996fca6 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/NewCMakeProjectWizard.java @@ -9,6 +9,7 @@ package org.eclipse.cdt.cmake.ui.internal; import org.eclipse.cdt.cmake.core.CMakeProjectGenerator; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.swt.widgets.Composite; import org.eclipse.tools.templates.core.IGenerator; import org.eclipse.tools.templates.ui.TemplateWizard; @@ -19,6 +20,12 @@ public class NewCMakeProjectWizard extends TemplateWizard { private WizardNewProjectCreationPage mainPage; @Override + public void setContainer(IWizardContainer wizardContainer) { + super.setContainer(wizardContainer); + setWindowTitle(Messages.NewCMakeProjectWizard_WindowTitle); + } + + @Override public void addPages() { mainPage = new WizardNewProjectCreationPage("basicNewProjectPage") { //$NON-NLS-1$ @Override @@ -29,8 +36,8 @@ public class NewCMakeProjectWizard extends TemplateWizard { Dialog.applyDialogFont(getControl()); } }; - mainPage.setTitle("New CMake Project"); //$NON-NLS-1$ - mainPage.setDescription("Specify properties of new CMake project."); //$NON-NLS-1$ + mainPage.setTitle(Messages.NewCMakeProjectWizard_PageTitle); + mainPage.setDescription(Messages.NewCMakeProjectWizard_Description); this.addPage(mainPage); } diff --git a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.properties b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties index e0e45fd3d9b..51b607823f3 100644 --- a/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/Messages.properties +++ b/build/org.eclipse.cdt.cmake.ui/src/org/eclipse/cdt/cmake/ui/internal/messages.properties @@ -8,3 +8,6 @@ CMakeBuildTab_UnixMakefiles=Unix Makefiles CMakePropertyPage_FailedToStartCMakeGui_Body=Failed to run the CMake GUI: CMakePropertyPage_FailedToStartCMakeGui_Title=Failed to run CMake GUI CMakePropertyPage_LaunchCMakeGui=Launch CMake GUI... +NewCMakeProjectWizard_Description=Specify properties of new CMake project. +NewCMakeProjectWizard_PageTitle=New CMake Project +NewCMakeProjectWizard_WindowTitle=New CMake Project |