JBoss Tools SVN: r37060 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-07 10:12:02 -0500 (Wed, 07 Dec 2011)
New Revision: 37060
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java
Log:
[JBIDE-10171] fixed regexp to look for URLs when you click the link in the creation log dialog
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java 2011-12-07 14:26:51 UTC (rev 37059)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UrlUtils.java 2011-12-07 15:12:02 UTC (rev 37060)
@@ -20,8 +20,19 @@
private static final int HTTP_SCHEME_MAX_LENGTH = 8;
private static final char HTTP_SCHEME_START_CHAR = 'h';
- private static final Pattern HTTP_SCHEME_REGEX = Pattern.compile("http?://");
-
+ private static final Pattern HTTP_SCHEME_REGEX = Pattern.compile("http[s]{0,1}://");
+
+ /**
+ * Returns an url that was found in the given text. It starts looking
+ * backwards from the given offset within the given string. Returns
+ * <code>null</code> if none was found.
+ *
+ * @param offset
+ * starting point to look back in the given text.
+ * @param text
+ * the text to search for an url
+ * @return the url that was found in the text
+ */
public static String getUrl(int offset, String text) {
int start = getUrlStart(offset, text);
if (start == -1) {
@@ -34,11 +45,19 @@
return text.substring(start, stop);
}
-
+
+ /**
+ * Steps back in the given text until the beginning of the text or an
+ * occurrence of http(s):// is found.
+ *
+ * @param offset the offset to start with stepping backwards
+ * @param text the text to search
+ * @return the index at which http(s):// was found
+ */
private static int getUrlStart(int offset, String text) {
for (int i = offset; i > 0; --i) {
- if (text.charAt(i) == HTTP_SCHEME_START_CHAR
- && (i + HTTP_SCHEME_MAX_LENGTH < text.length())) {
+ if (text.charAt(i) == HTTP_SCHEME_START_CHAR
+ && (i + HTTP_SCHEME_MAX_LENGTH < text.length())) {
Matcher matcher = HTTP_SCHEME_REGEX.matcher(text.substring(i, i + HTTP_SCHEME_MAX_LENGTH));
if (matcher.find()) {
return i;
14 years
JBoss Tools SVN: r37059 - 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: adietish
Date: 2011-12-07 09:26:51 -0500 (Wed, 07 Dec 2011)
New Revision: 37059
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/ImportProjectWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java
Log:
[JBIDE-10171] Corrected wording in different labels and dialog titles
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-07 13:52:37 UTC (rev 37058)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-07 14:26:51 UTC (rev 37059)
@@ -71,8 +71,9 @@
public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) {
super(
"Import OpenShift application",
- "Select the project to enable, the Git clone destination, the branch to clone"
- + " and configure your server adapter ",
+ "Choose to create a new/use existing project, " +
+ "the GITbranch and clone destination, "
+ + "and configure your server adapter ",
"Server Adapter",
wizard);
this.model = new AdapterWizardPageModel(model);
@@ -484,7 +485,7 @@
return ValidationStatus.ok();
} else {
return ValidationStatus.error(
- "You have to select a project that shall be enabled for OpenShift");
+ "Select an existing project to use with OpenShift");
}
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-07 13:52:37 UTC (rev 37058)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-07 14:26:51 UTC (rev 37059)
@@ -27,6 +27,7 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.errors.TransportException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.common.ui.WizardUtils;
@@ -72,7 +73,7 @@
if (model.isNewProject()) {
model.importProject(monitor);
} else {
- if (!askForConfirmation()) {
+ if (!askForConfirmation(model.getApplicationName(), model.getProjectName())) {
return Status.CANCEL_STATUS;
}
model.addToExistingProject(monitor);
@@ -119,16 +120,18 @@
}
}
- private boolean askForConfirmation() {
+ private boolean askForConfirmation(final String applicationName, final String projectName) {
final boolean[] confirmed = new boolean[1];
getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
confirmed[0] = MessageDialog.openConfirm(getShell(),
- "Confirm project modification",
- "This will copy OpenShit configuration files to your project.\n" +
- "Are you sure that you want to allow this?");
+ NLS.bind("Import OpenShift Application ", applicationName),
+ NLS.bind(
+ "OpenShift application {0} will be enabled on project {1} by copying OpenShift " +
+ "configuration and enable Git for the project.\n " +
+ "This cannot be undone. Do you wish to continue ?", applicationName, projectName));
}});
return confirmed[0];
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2011-12-07 13:52:37 UTC (rev 37058)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2011-12-07 14:26:51 UTC (rev 37059)
@@ -33,7 +33,7 @@
public SelectExistingProjectDialog(String openShiftAppName, Shell shell) {
super(shell, new ProjectLabelProvider());
- setTitle("Project Selection");
+ setTitle("Select Existing Project");
setMessage(NLS.bind(
"Select an existing project for {0}.\nOnly java projects which are not Team shared can be used.",
openShiftAppName));
14 years
JBoss Tools SVN: r37058 - in branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples: src/org/jboss/tools/project/examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-07 08:52:37 -0500 (Wed, 07 Dec 2011)
New Revision: 37058
Modified:
branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
Log:
JBIDE-10243 Improve cheatsheets
Modified: branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2011-12-07 13:49:56 UTC (rev 37057)
+++ branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2011-12-07 13:52:37 UTC (rev 37058)
@@ -31,7 +31,8 @@
org.eclipse.equinox.p2.metadata,
org.jboss.tools.portlet.core,
org.eclipse.equinox.p2.operations,
- org.eclipse.jst.server.core
+ org.eclipse.jst.server.core,
+ org.eclipse.core.filesystem;bundle-version="1.3.100"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.jboss.tools.project.examples,
Modified: branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-12-07 13:49:56 UTC (rev 37057)
+++ branches/jbosstools-3.3.0.M5/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-12-07 13:52:37 UTC (rev 37058)
@@ -16,12 +16,12 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -29,10 +29,13 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -57,6 +60,7 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IPerspectiveRegistry;
import org.eclipse.ui.IPluginContribution;
@@ -72,6 +76,8 @@
import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.ide.FileStoreEditorInput;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.IPreferenceConstants;
import org.eclipse.ui.internal.WorkbenchPlugin;
@@ -82,6 +88,7 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
+import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
import org.jboss.tools.project.examples.dialog.MarkerDialog;
@@ -105,6 +112,7 @@
private static final String README_HTML = "/readme.html"; //$NON-NLS-1$
private static final String CHEATSHEET_XML = "/cheatsheet.xml"; //$NON-NLS-1$
private static final String PERIOD_CHEATSHEET_XML = "/.cheatsheet.xml"; //$NON-NLS-1$
+ private static final String README_MD = "/readme.md"; //$NON-NLS-1$
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.project.examples"; //$NON-NLS-1$
public static final String ALL_SITES = Messages.ProjectExamplesActivator_All;
@@ -421,9 +429,40 @@
view.getCheatSheetViewer().setInput(id, id, finalURL, new DefaultStateManager(), false);
} else {
try {
- IWorkbenchBrowserSupport browserSupport = ProjectExamplesActivator.getDefault().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
- browser.openURL(finalURL);
+ if (finalURL.toString().endsWith(README_MD)) {
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ IFile[] files = null;
+ try {
+ files = root.findFilesForLocationURI(finalURL.toURI());
+ } catch (URISyntaxException e1) {
+ ProjectExamplesActivator.log(e1);
+ return;
+ }
+ if (files.length > 0) {
+ try {
+ IFileEditorInput input = new FileEditorInput(files[0]);
+ IDE.openEditor(page, input, EditorsUI.DEFAULT_TEXT_EDITOR_ID);
+ } catch (PartInitException e) {
+ ProjectExamplesActivator.log(e);
+ }
+ } else {
+ IFileStore store = EFS.getLocalFileSystem().getStore(
+ new Path(finalURL.getPath()));
+ try {
+ IDE.openEditor(page, new FileStoreEditorInput(store),
+ EditorsUI.DEFAULT_TEXT_EDITOR_ID);
+ } catch (PartInitException e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
+
+ } else {
+ IWorkbenchBrowserSupport browserSupport = ProjectExamplesActivator.getDefault().getWorkbench().getBrowserSupport();
+ IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,
+ null, null, null);
+ browser.openURL(finalURL);
+ }
} catch (PartInitException e) {
ProjectExamplesActivator.log(e);
}
@@ -471,6 +510,10 @@
ProjectUtil.EDITOR)) {
return;
}
+ if (checkCheatsheet(project, eclipseProject, README_MD,
+ ProjectUtil.EDITOR)) {
+ return;
+ }
}
}
14 years
JBoss Tools SVN: r37057 - in trunk/examples/plugins/org.jboss.tools.project.examples: src/org/jboss/tools/project/examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-07 08:49:56 -0500 (Wed, 07 Dec 2011)
New Revision: 37057
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
Log:
JBIDE-10243 Improve cheatsheets
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2011-12-07 13:36:44 UTC (rev 37056)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2011-12-07 13:49:56 UTC (rev 37057)
@@ -31,7 +31,8 @@
org.eclipse.equinox.p2.metadata,
org.jboss.tools.portlet.core,
org.eclipse.equinox.p2.operations,
- org.eclipse.jst.server.core
+ org.eclipse.jst.server.core,
+ org.eclipse.core.filesystem;bundle-version="1.3.100"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.jboss.tools.project.examples,
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-12-07 13:36:44 UTC (rev 37056)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-12-07 13:49:56 UTC (rev 37057)
@@ -16,12 +16,12 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -29,10 +29,13 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -57,6 +60,7 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IPerspectiveRegistry;
import org.eclipse.ui.IPluginContribution;
@@ -72,6 +76,8 @@
import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.ide.FileStoreEditorInput;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.IPreferenceConstants;
import org.eclipse.ui.internal.WorkbenchPlugin;
@@ -82,6 +88,7 @@
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
+import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
import org.jboss.tools.project.examples.dialog.MarkerDialog;
@@ -105,6 +112,7 @@
private static final String README_HTML = "/readme.html"; //$NON-NLS-1$
private static final String CHEATSHEET_XML = "/cheatsheet.xml"; //$NON-NLS-1$
private static final String PERIOD_CHEATSHEET_XML = "/.cheatsheet.xml"; //$NON-NLS-1$
+ private static final String README_MD = "/readme.md"; //$NON-NLS-1$
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.project.examples"; //$NON-NLS-1$
public static final String ALL_SITES = Messages.ProjectExamplesActivator_All;
@@ -421,9 +429,40 @@
view.getCheatSheetViewer().setInput(id, id, finalURL, new DefaultStateManager(), false);
} else {
try {
- IWorkbenchBrowserSupport browserSupport = ProjectExamplesActivator.getDefault().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
- browser.openURL(finalURL);
+ if (finalURL.toString().endsWith(README_MD)) {
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ IFile[] files = null;
+ try {
+ files = root.findFilesForLocationURI(finalURL.toURI());
+ } catch (URISyntaxException e1) {
+ ProjectExamplesActivator.log(e1);
+ return;
+ }
+ if (files.length > 0) {
+ try {
+ IFileEditorInput input = new FileEditorInput(files[0]);
+ IDE.openEditor(page, input, EditorsUI.DEFAULT_TEXT_EDITOR_ID);
+ } catch (PartInitException e) {
+ ProjectExamplesActivator.log(e);
+ }
+ } else {
+ IFileStore store = EFS.getLocalFileSystem().getStore(
+ new Path(finalURL.getPath()));
+ try {
+ IDE.openEditor(page, new FileStoreEditorInput(store),
+ EditorsUI.DEFAULT_TEXT_EDITOR_ID);
+ } catch (PartInitException e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
+
+ } else {
+ IWorkbenchBrowserSupport browserSupport = ProjectExamplesActivator.getDefault().getWorkbench().getBrowserSupport();
+ IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,
+ null, null, null);
+ browser.openURL(finalURL);
+ }
} catch (PartInitException e) {
ProjectExamplesActivator.log(e);
}
@@ -471,6 +510,10 @@
ProjectUtil.EDITOR)) {
return;
}
+ if (checkCheatsheet(project, eclipseProject, README_MD,
+ ProjectUtil.EDITOR)) {
+ return;
+ }
}
}
14 years
JBoss Tools SVN: r37056 - 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: adietish
Date: 2011-12-07 08:36:44 -0500 (Wed, 07 Dec 2011)
New Revision: 37056
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10171] Corrected server adapter labels (group and checkbox) on AdapterWizardPage
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-07 13:33:52 UTC (rev 37055)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-07 13:36:44 UTC (rev 37056)
@@ -343,7 +343,7 @@
private Group createAdapterGroup(Composite parent, DataBindingContext dbc) {
Group serverAdapterGroup = new Group(parent, SWT.BORDER);
- serverAdapterGroup.setText("OpenShift JBoss Server adapter");
+ serverAdapterGroup.setText("Server Adapter");
GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(serverAdapterGroup);
Composite c = new Composite(serverAdapterGroup, SWT.NONE);
@@ -352,7 +352,7 @@
GridLayoutFactory.fillDefaults().numColumns(3).spacing(12, 8).applyTo(c);
serverAdapterCheckbox = new Button(c, SWT.CHECK);
- serverAdapterCheckbox.setText("Create a JBoss server adapter");
+ serverAdapterCheckbox.setText("Create OpenShift Server Adapter");
GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER)
.grab(true, false).applyTo(serverAdapterCheckbox);
serverAdapterCheckbox.addSelectionListener(onCreateAdapter());
14 years
JBoss Tools SVN: r37055 - 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: adietish
Date: 2011-12-07 08:33:52 -0500 (Wed, 07 Dec 2011)
New Revision: 37055
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10171] now disabling the label "Existing Project", too, if the user has chosen a non-jbossas-70 application
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-07 13:10:47 UTC (rev 37054)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-07 13:33:52 UTC (rev 37055)
@@ -125,6 +125,11 @@
existingProjectLabel.setText("Existing Project");
GridDataFactory
.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(existingProjectLabel);
+ ValueBindingBuilder
+ .bind(WidgetProperties.enabled().observe(existingProjectLabel))
+ .notUpdating(newProjectObservable)
+ .converting(new InvertingBooleanConverter())
+ .in(dbc);
Text newProjectText = new Text(projectGroup, SWT.BORDER);
newProjectText.setEditable(false);
GridDataFactory.fillDefaults()
@@ -472,8 +477,8 @@
*/
if (Boolean.TRUE.equals(newProjectObservable.getValue())) {
return ValidationStatus.ok();
- }
-
+ }
+
if (newProjectNameObservable.getValue() != null
&& (!((String) newProjectNameObservable.getValue()).isEmpty())) {
return ValidationStatus.ok();
14 years
JBoss Tools SVN: r37054 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-07 08:10:47 -0500 (Wed, 07 Dec 2011)
New Revision: 37054
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Added test of adding existing managed bean via New Managed Bean Form
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-07 12:24:09 UTC (rev 37053)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-07 13:10:47 UTC (rev 37054)
@@ -29,6 +29,7 @@
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.DragAndDropHelper;
+import org.jboss.tools.ui.bot.ext.helper.TableHelper;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
@@ -137,6 +138,34 @@
.setText(managedBeanClass);
facesConfigEditorExt.save();
bot.sleep(Timing.time1S());
+ // Delete Managed Bean and add it back via New Managed Bean Form
+ tiManagedbean.select();
+ editorBot.table().select(managedBeanName);
+ editorBot.button(IDELabel.Button.REMOVE_WITH_DOTS).click();
+ bot.shell(IDELabel.Shell.CONFIRMATION).activate();
+ bot.checkBox(IDELabel.FacesConfigEditor.DELETE_JAVA_SOURCE_CHECK_BOX).deselect();
+ bot.button(IDELabel.Button.OK).click();
+ editorBot.button(IDELabel.Button.ADD).click();
+ bot.shell(AbstractFacesConfigEditingTest.getAddManagedBeanDialogTitle(getTestProjectType())).activate();
+ bot.button(IDELabel.Button.BROWSE).click();
+ bot.shell(IDELabel.Shell.SELECT_CLASS).activate();
+ bot.text().setText(managedBeanClass);
+ bot.sleep(Timing.time2S());
+ final String selectedClassLabel = TableHelper.getSelectionText(bot.table());
+ assertTrue ("Selected item in table has to start with " + managedBeanClass +
+ "\n but is:\n" + selectedClassLabel,
+ selectedClassLabel.startsWith(managedBeanClass));
+ bot.button(IDELabel.Button.OK).click();
+ bot.textWithLabel(IDELabel.FacesConfigEditor.NEW_MANAGED_BEAN_NAME_LABEL)
+ .setText(managedBeanName);
+ bot.button(IDELabel.Button.FINISH).click();
+ facesConfigEditorExt.save();
+ bot.sleep(Timing.time1S());
+ Assertions.assertSourceEditorContains(stripXMLSourceText(facesConfigEditorExt.getText()),
+ "<managed-bean><managed-bean-name>" + managedBeanName + "</managed-bean-name>" +
+ "<managed-bean-class>" + managedBeanClass + "</managed-bean-class>" +
+ "<managed-bean-scope>request</managed-bean-scope></managed-bean>",
+ AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME);
// Delete Managed Bean
tiManagedbean.select();
editorBot.table().select(managedBeanName);
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-07 12:24:09 UTC (rev 37053)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-07 13:10:47 UTC (rev 37054)
@@ -116,6 +116,7 @@
public static final String DOWN = "Down";
public static final String ADD_VARIABLE = "Add Variable...";
public static final String CONFIGURE_VARIABLES = "Configure Variables...";
+ public static final String BROWSE = "Browse...";
}
public class Shell {
@@ -191,6 +192,7 @@
public static final String NEW_VARIABLE_ENTRY = "New Variable Entry";
public static final String CLASSPATH_VARIABLES_CHANGED = "Classpath Variables Changed";
public static final String CLEAN = "Clean";
+ public static final String SELECT_CLASS = "Select Class";
}
public class EntityGroup {
@@ -280,6 +282,7 @@
public static final String GUVNOR_REPOSITORY_EXPLORING = "Guvnor Repository Exploring";
public static final String DROOLS = "Drools";
public static final String JBPM3 = "jBPM jPDL 3";
+ public static final String CONFIGURE_VARIABLES = "Configure Variables...";
}
/**
* Hibernate Console Wizard (ConsoleConfigurationCreationWizard) Labels (
14 years
JBoss Tools SVN: r37053 - 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: adietish
Date: 2011-12-07 07:24:09 -0500 (Wed, 07 Dec 2011)
New Revision: 37053
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-10171] creating .gitignore (commented TODO: merge existing .gitignore)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 12:22:48 UTC (rev 37052)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 12:24:09 UTC (rev 37053)
@@ -204,15 +204,14 @@
/**
* Creates the git ignore file with a predefined set of entries. An existing
* .gitignore file is not overwritten, we then just dont do anything.
- * <p>
- * TODO: merge existing .gitignore
- * (https://issues.jboss.org/browse/JBIDE-10391)
*
* @param projectFolder
* @throws IOException
*/
private void createGitIgnore(File projectFolder) throws IOException {
GitIgnore gitIgnore = new GitIgnore(projectFolder);
+ // TODO: merge existing .gitignore
+ // (https://issues.jboss.org/browse/JBIDE-10391)
if (gitIgnore.exists()) {
return;
}
14 years
JBoss Tools SVN: r37052 - 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: adietish
Date: 2011-12-07 07:22:48 -0500 (Wed, 07 Dec 2011)
New Revision: 37052
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-10171] creating .gitignore
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 12:17:02 UTC (rev 37051)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-07 12:22:48 UTC (rev 37052)
@@ -204,6 +204,9 @@
/**
* Creates the git ignore file with a predefined set of entries. An existing
* .gitignore file is not overwritten, we then just dont do anything.
+ * <p>
+ * TODO: merge existing .gitignore
+ * (https://issues.jboss.org/browse/JBIDE-10391)
*
* @param projectFolder
* @throws IOException
14 years
JBoss Tools SVN: r37051 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-07 07:17:02 -0500 (Wed, 07 Dec 2011)
New Revision: 37051
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
Log:
https://issues.jboss.org/browse/JBIDE-10280 : BrowserSim: simulate orientation change
- removed landscape devices since there are buttons for rotating now
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-07 12:16:02 UTC (rev 37050)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-07 12:17:02 UTC (rev 37051)
@@ -1,15 +1,9 @@
0
PC (Default) -1 -1
-Apple iPad 2 (Portrait) 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
-Apple iPad 2 (Landscape) 1024 768 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
-Apple iPhone 3 (Portrait) 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 3 (Landscape) 480 320 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 4 (Portrait) 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 4 (Landscape) 960 640 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
+Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
+Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
+Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+
-Samsung Galaxy S (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S II (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S II (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy Tab 10.1 (Portrait) 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
-Samsung Galaxy Tab 10.1 (Landscape) 1280 800 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
+Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
14 years