JBoss Tools SVN: r38780 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: wizards/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-15 16:25:24 -0500 (Wed, 15 Feb 2012)
New Revision: 38780
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
Log:
JBIDE-10892
https://issues.jboss.org/browse/JBIDE-10892
Improved comparing paths.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2012-02-15 21:15:36 UTC (rev 38779)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2012-02-15 21:25:24 UTC (rev 38780)
@@ -11,6 +11,7 @@
package org.jboss.tools.jst.web.ui.operation;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Iterator;
@@ -412,14 +413,14 @@
wcco.setDataModel(dataModel);
dataModel.setProperty(IProjectCreationPropertiesNew.PROJECT_NAME, projectName);
dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- if(!isDefaultLocation(projectLocation)) {
+ if(!isDefaultLocation(projectLocation, true)) {
dataModel.setProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION, Boolean.FALSE);
dataModel.setProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION, projectLocation);
}
if(!getProject().exists()) {
IProjectDescription pd = ModelPlugin.getWorkspace().newProjectDescription(getProject().getName());
- if(!isDefaultLocation(projectLocation)) {
+ if(!isDefaultLocation(projectLocation, true)) {
pd.setLocation(new Path(projectLocation));
}
getProject().create(pd, null);
@@ -516,16 +517,29 @@
return true;
}
- private boolean isDefaultLocation(String projectLocation) {
+ protected boolean isDefaultLocation(String projectLocation, boolean exact) {
String root = ModelPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
- return (projectLocation.replace('\\','/') + "/").equals(root + "/" + getProject().getName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-// return (projectLocation.replace('\\','/') + "/").startsWith(root + "/" + getProject().getName() + "/");
+ try {
+ File f1 = new File(projectLocation);
+ if(f1.exists()) {
+ String pLocation = f1.getCanonicalPath().replace('\\','/') + '/';
+ String rLocation = ModelPlugin.getWorkspace().getRoot().getLocation().toFile().getCanonicalPath().replace('\\','/') + '/' + getProject().getName() + '/';
+ return exact ? pLocation.equals(rLocation) : pLocation.startsWith(rLocation);
+
+ }
+ } catch (IOException e) {
+ WebUiPlugin.getDefault().logError(e);
+ }
+ return exact ? (projectLocation.replace('\\','/') + '/').equals(root + '/' + getProject().getName() + '/')
+ : (projectLocation.replace('\\','/') + '/').startsWith(root + '/' + getProject().getName() + '/');
}
private String createLinks(String projectLocation) throws CoreException {
+ if(isDefaultLocation(projectLocation, false)) {
+ return projectLocation;
+ }
IProject project = getProject();
String root = ModelPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
- if((projectLocation.replace('\\','/') + "/").startsWith(root + "/" + project.getName() + "/")) return projectLocation; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String webroot = getProperty(WEB_CONTENT_LOCATION_ID);
String[] javaRoot = (String[])getPropertyObject(JAVA_SOURCES_LOCATION_ID);
@@ -566,6 +580,11 @@
return wsProjectLocation;
}
+
+// private boolean isProjectLocationInsideWorkspaceProject(String projectLocation) {
+// File project
+// return false;
+// }
private org.eclipse.wst.common.project.facet.core.runtime.IRuntime findFacetRuntime(IRuntime runtime) {
String runtimeName = getProperty(WebNatureOperation.RUNTIME_NAME);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2012-02-15 21:15:36 UTC (rev 38779)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebProjectAdoptOperation.java 2012-02-15 21:25:24 UTC (rev 38780)
@@ -163,9 +163,11 @@
if(getProject().exists()) return true;
String location = getProperty(PROJECT_LOCATION_ID).replace('\\', '/');
+ if(isDefaultLocation(location, false)) {
+ return true;
+ }
String root = ModelPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
String wsProjectLocation = (root + "/" + getProject().getName()).replace('\\', '/');; //$NON-NLS-1$
- if(location.equals(wsProjectLocation) || location.startsWith(wsProjectLocation + "/")) return true; //$NON-NLS-1$
File wsf = new File(wsProjectLocation);
if(!wsf.isDirectory()) return true;
File[] cs = wsf.listFiles();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2012-02-15 21:15:36 UTC (rev 38779)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizardPage.java 2012-02-15 21:25:24 UTC (rev 38780)
@@ -13,6 +13,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -103,7 +104,7 @@
webXmlLocationAdapter.setValue("" + context.getInitialLocation()); //$NON-NLS-1$
} else {
linkAdapter = support.getPropertyEditorAdapterByName(ImportWebDirProjectContext.ATTR_LINK);
- linkAdapter.setValue("true"); //$NON-NLS-1$
+ linkAdapter.setValue("false"); //$NON-NLS-1$
}
}
@@ -185,9 +186,12 @@
setPageComplete(validatePage());
getContainer().updateButtons();
if(linkAdapter != null) {
- support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink(), (Composite)getControl());
+ boolean requiresLink = !isProjectFolderPresentInWorkspace() && isLocationInsideWorkspace();
+ support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink() && !requiresLink, (Composite)getControl());
if(!mayNeedLink() && linkAdapter != null) {
linkAdapter.setValue("false"); //$NON-NLS-1$
+ } else if(requiresLink) {
+ linkAdapter.setValue("true"); //$NON-NLS-1$
}
}
}
@@ -199,12 +203,15 @@
updateContext(false, true);
setPageComplete(validatePage());
getContainer().updateButtons();
+ boolean requiresLink = !isProjectFolderPresentInWorkspace() && isLocationInsideWorkspace();
if(linkAdapter != null) {
- support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink(), (Composite)getControl());
+ support.getFieldEditorByName(ImportWebDirProjectContext.ATTR_LINK).setEnabled(mayNeedLink() && !requiresLink, (Composite)getControl());
+ if(!mayNeedLink()) {
+ linkAdapter.setValue("false"); //$NON-NLS-1$
+ } else if(requiresLink) {
+ linkAdapter.setValue("true"); //$NON-NLS-1$
+ }
}
- if(!mayNeedLink() && linkAdapter != null) {
- linkAdapter.setValue("false"); //$NON-NLS-1$
- }
}
}
);
@@ -235,11 +242,29 @@
private boolean mayNeedLink() {
String location = getWebXmlLocationValue();
if(location == null || location.trim().length() == 0) return false;
+ return !isProjectFolderPresentInWorkspace() || !isLocationInsideWorkspace();
+ }
+
+ private boolean isProjectFolderPresentInWorkspace() {
+ File workspaceFile = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
+ return new File(workspaceFile, getProjectNameValue()).exists();
+ }
+
+ private boolean isLocationInsideWorkspace() {
+ String location = getWebXmlLocationValue();
+ if(location == null || location.trim().length() == 0) return false;
String workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/') + '/';
location = location.replace('\\', '/');
- if(!location.startsWith(workspace)) return true;
-
- return false;
+ File webxmlFile = new File(location);
+ File workspaceFile = new File(workspace);
+ if(webxmlFile.exists() && workspaceFile.exists()) {
+ try {
+ return webxmlFile.getCanonicalPath().startsWith(workspaceFile.getCanonicalPath());
+ } catch (IOException e) {
+ WebUiPlugin.getDefault().logError(e);
+ }
+ }
+ return location.startsWith(workspace);
}
private void updateProjectNameValue(boolean onProjectNameEdit, boolean onProjectLocationEdit) {
@@ -439,7 +464,7 @@
setErrorMessage(WizardKeys.getString(ImportWebDirProjectContext.PAGE_NAME+"_existsInWorkspace")); //$NON-NLS-1$
return false;
}
-
+
return true;
}
14 years, 1 month
JBoss Tools SVN: r38779 - 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: 2012-02-15 16:15:36 -0500 (Wed, 15 Feb 2012)
New Revision: 38779
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
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-15 21:13:11 UTC (rev 38778)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-15 21:15:36 UTC (rev 38779)
@@ -124,7 +124,7 @@
dbc.addValidationStatusProvider(
new RepoPathValidationStatusProvider(isDefaultRepoObservable, repoPathObservable));
-
+
// Remote Name Management
useDefaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
useDefaultRemoteNameButton.setText("Use default remote name");
@@ -217,8 +217,6 @@
protected void onPageActivated(DataBindingContext dbc) {
// allow to enable a proj only for as7 openshift applications
- // setTitle(NLS.bind("Import OpenShift application {0}",
- // pageModel.getApplicationName()));
// pageModel.resetRepositoryPath();
pageModel.resetRemoteName();
enableWidgets(pageModel.isNewProject());
14 years, 1 month
JBoss Tools SVN: r38778 - 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: 2012-02-15 16:13:11 -0500 (Wed, 15 Feb 2012)
New Revision: 38778
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
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-15 21:11:20 UTC (rev 38777)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-15 21:13:11 UTC (rev 38778)
@@ -221,7 +221,11 @@
// pageModel.getApplicationName()));
// pageModel.resetRepositoryPath();
pageModel.resetRemoteName();
- if (pageModel.isNewProject()) {
+ enableWidgets(pageModel.isNewProject());
+ }
+
+ private void enableWidgets(boolean isNewProject) {
+ if (isNewProject) {
useDefaultRepoPathButton.setEnabled(true);
useDefaultRemoteNameButton.setEnabled(false);
useDefaultRemoteNameButton.setSelection(true);
14 years, 1 month
JBoss Tools SVN: r38777 - 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: 2012-02-15 16:11:20 -0500 (Wed, 15 Feb 2012)
New Revision: 38777
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
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-15 21:07:01 UTC (rev 38776)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-15 21:11:20 UTC (rev 38777)
@@ -46,6 +46,7 @@
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
/**
* @author Andre Dietisheim
@@ -119,13 +120,7 @@
.notUpdating(useDefaultRepoModelObservable).converting(new InvertingBooleanConverter()).in(dbc);
// move focus to the project location text control when not choosing the
// 'Use default location' option.
- useDefaultRepoPathButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- repoPathText.setFocus();
- repoPathText.selectAll();
- }
- });
+ UIUtils.focusOnSelection(useDefaultRepoPathButton, repoPathText);
dbc.addValidationStatusProvider(
new RepoPathValidationStatusProvider(isDefaultRepoObservable, repoPathObservable));
14 years, 1 month
JBoss Tools SVN: r38776 - 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: 2012-02-15 16:07:01 -0500 (Wed, 15 Feb 2012)
New Revision: 38776
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
removed unneeded code
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-15 21:05:42 UTC (rev 38775)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-02-15 21:07:01 UTC (rev 38776)
@@ -127,11 +127,6 @@
}
});
-// IObservableValue repoPathValidityObservable = BeanProperties.value(
-// GitCloningSettingsWizardPageModel.PROPERTY_CUSTOM_REPO_PATH_VALIDITY).observe(pageModel);
-// dbc.addValidationStatusProvider(
-// new RepoPathValidationStatusProvider(isDefaultRepoObservable, repoPathObservable));
-
dbc.addValidationStatusProvider(
new RepoPathValidationStatusProvider(isDefaultRepoObservable, repoPathObservable));
@@ -167,11 +162,6 @@
// move focus to the project name text control when choosing the 'Use an
// existing project' option.
useDefaultRemoteNameButton.addSelectionListener(onDefaultRemoteNameUnchecked());
- // IObservableValue remoteNameValidityObservable = BeanProperties.value(
- // GitCloningSettingsWizardPageModel.PROPERTY_CUSTOM_REMOTE_NAME_VALIDITY).observe(pageModel);
- // dbc.addValidationStatusProvider(new
- // RemoteNameValidationStatusProvider(remoteNameValidityObservable,
- // remoteNameTextObservable));
dbc.addValidationStatusProvider(
new RemoteNameValidationStatusProvider(
@@ -246,23 +236,8 @@
useDefaultRemoteNameButton.setEnabled(true);
remoteNameText.setEnabled(!useDefaultRemoteNameButton.getSelection());
}
- // pageModel.getWizardModel().setProperty(AdapterWizardPageModel.MODE,
- // AdapterWizardPageModel.MODE_SOURCE);
- onPageActivatedBackground(dbc);
}
- protected void onPageActivatedBackground(final DataBindingContext dbc) {
- /*
- * new Job("Loading remote OpenShift application") { public IStatus
- * run(IProgressMonitor monitor) { try { pageModel.loadGitUri();
- * pageModel.loadApplicationUrl(); } catch (OpenShiftException e) {
- * IStatus status =
- * OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
- * OpenShiftUIActivator.log(status); return status; } return
- * Status.OK_STATUS; } }.schedule();
- */
- }
-
/**
* A multivalidator for the repo path. Validates the repo path on behalf of
* the selection to use the default repo path and the repo path value.
14 years, 1 month
JBoss Tools SVN: r38775 - 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: 2012-02-15 16:05:42 -0500 (Wed, 15 Feb 2012)
New Revision: 38775
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
Log:
removed unneeded code
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-15 20:55:05 UTC (rev 38774)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-15 21:05:42 UTC (rev 38775)
@@ -20,7 +20,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
-import com.openshift.express.client.OpenShiftException;
/**
* @author Andre Dietisheim
@@ -29,17 +28,12 @@
*/
public class GitCloningSettingsWizardPageModel extends ObservableUIPojo {
- public static final String PROPERTY_NEW_PROJECT = "newProject";
- public static final String PROPERTY_CLONE_URI = "cloneUri";
- public static final String PROPERTY_APPLICATION_URL = "applicationUrl";
public static final String PROPERTY_REPO_PATH = "repositoryPath";
public static final String PROPERTY_REMOTE_NAME = "remoteName";
- public static final String PROPERTY_LOADING = "loading";
public static final String PROPERTY_USE_DEFAULT_REPO_PATH = "useDefaultRepoPath";
public static final String PROPERTY_USE_DEFAULT_REMOTE_NAME = "useDefaultRemoteName";
private IOpenShiftExpressWizardModel wizardModel;
- private boolean loading;
private boolean useDefaultRepoPath = true;
private boolean useDefaultRemoteName = true;
@@ -52,40 +46,6 @@
return wizardModel.isNewProject();
}
- public void loadGitUri() throws OpenShiftException {
- setLoading(true);
- setCloneUri("Loading...");
- setCloneUri(getCloneUri());
- setLoading(false);
- }
-
- private void setCloneUri(String gitUri) {
- firePropertyChange(PROPERTY_CLONE_URI, null, gitUri);
- }
-
- public String getCloneUri() throws OpenShiftException {
- IApplication application = wizardModel.getApplication();
- if (application == null) {
- return null;
- }
- return application.getGitUri();
- }
-
- public void loadApplicationUrl() throws OpenShiftException {
- setLoading(true);
- setApplicationUrl("Loading...");
- setApplicationUrl(getApplicationUrl());
- setLoading(false);
- }
-
- public String getApplicationUrl() throws OpenShiftException {
- IApplication application = wizardModel.getApplication();
- if (application == null) {
- return null;
- }
- return application.getApplicationUrl();
- }
-
public String getApplicationName() {
return wizardModel.getApplicationName();
}
@@ -98,10 +58,6 @@
return ICartridge.JBOSSAS_7.equals(application.getCartridge());
}
- public void setApplicationUrl(String applicationUrl) {
- firePropertyChange(PROPERTY_APPLICATION_URL, null, applicationUrl);
- }
-
public String getRepositoryPath() {
return wizardModel.getRepositoryPath();
}
@@ -148,14 +104,6 @@
firePropertyChange(PROPERTY_REMOTE_NAME, wizardModel.getRemoteName(), wizardModel.setRemoteName(remoteName));
}
- public boolean isLoading() {
- return loading;
- }
-
- public void setLoading(boolean loading) {
- firePropertyChange(PROPERTY_LOADING, this.loading, this.loading = loading);
- }
-
public boolean isCompatibleToApplicationCartridge(ICartridge cartridge) {
IApplication application = wizardModel.getApplication();
return application != null && application.getCartridge() != null
14 years, 1 month
JBoss Tools SVN: r38774 - in trunk/seam/tests/org.jboss.tools.seam.core.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-15 15:55:05 -0500 (Wed, 15 Feb 2012)
New Revision: 38774
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/.classpath 2012-02-15 20:47:57 UTC (rev 38773)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/.classpath 2012-02-15 20:55:05 UTC (rev 38774)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2012-02-15 20:47:57 UTC (rev 38773)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2012-02-15 20:55:05 UTC (rev 38774)
@@ -41,4 +41,4 @@
org.jboss.tools.common.validation,
org.jboss.tools.common.base.test;bundle-version="3.3.0"
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 years, 1 month
JBoss Tools SVN: r38773 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-02-15 15:47:57 -0500 (Wed, 15 Feb 2012)
New Revision: 38773
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
Log:
And another useful comment
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 20:45:58 UTC (rev 38772)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 20:47:57 UTC (rev 38773)
@@ -172,7 +172,7 @@
LinkedList<SWTBotTreeItem> treeItems = new LinkedList<SWTBotTreeItem>();
for (SWTBotTreeItem treeItem : SWTEclipseExt.getAllTreeItemsRecursive(bot, tree, parent, expand)){
- log.error("ERROR: " + treeItem.getText()); // ldimaggi
+ log.error("ERROR: " + treeItem.getText()); // ldimaggi - needed for debugging project errors
if (ProblemsView.testProblemsTreeItemForStringCondition(treeItem, descriptionContains,
ProblemsView.PROBLEMS_DESCRIPTION_COLUMN_INDEX, StringConditionType.CONTAINS)
14 years, 1 month
JBoss Tools SVN: r38772 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-02-15 15:45:58 -0500 (Wed, 15 Feb 2012)
New Revision: 38772
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
Log:
Added descriptive comment
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 20:44:45 UTC (rev 38771)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 20:45:58 UTC (rev 38772)
@@ -115,7 +115,7 @@
SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null,
IDELabel.ProblemsTree.ERRORS,"","","",
true );
-// false); // ldimaggi
+// false); // ldimaggi - if false - error tree cannot write details to log
if (filteredTreeItems != null && filteredTreeItems.length > 0){
errorsNode = filteredTreeItems[0];
14 years, 1 month
JBoss Tools SVN: r38771 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-02-15 15:44:45 -0500 (Wed, 15 Feb 2012)
New Revision: 38771
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
Log:
Added logging to view/ProblemsView.java - as the view only returns the first line of the problems tree
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 19:58:40 UTC (rev 38770)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2012-02-15 20:44:45 UTC (rev 38771)
@@ -36,7 +36,7 @@
public static final int PROBLEMS_RESOURCE_COLUMN_INDEX = 1;
public static final int PROBLEMS_PATH_COLUMN_INDEX = 2;
public static final int PROBLEMS_TYPE_COLUMN_INDEX = 4;
- Logger log = Logger.getLogger(ProblemsView.class);
+ static Logger log = Logger.getLogger(ProblemsView.class);
public ProblemsView() {
viewObject = ActionItem.View.GeneralProblems.LABEL;
}
@@ -114,9 +114,11 @@
try{
SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null,
IDELabel.ProblemsTree.ERRORS,"","","",
- false);
+ true );
+// false); // ldimaggi
+
if (filteredTreeItems != null && filteredTreeItems.length > 0){
- errorsNode = filteredTreeItems[0];
+ errorsNode = filteredTreeItems[0];
}
} catch (WidgetNotFoundException wnfe){
// do nothing
@@ -169,8 +171,11 @@
LinkedList<SWTBotTreeItem> treeItems = new LinkedList<SWTBotTreeItem>();
for (SWTBotTreeItem treeItem : SWTEclipseExt.getAllTreeItemsRecursive(bot, tree, parent, expand)){
+
+ log.error("ERROR: " + treeItem.getText()); // ldimaggi
+
if (ProblemsView.testProblemsTreeItemForStringCondition(treeItem, descriptionContains,
- ProblemsView.PROBLEMS_DESCRIPTION_COLUMN_INDEX, StringConditionType.CONTAINS)
+ ProblemsView.PROBLEMS_DESCRIPTION_COLUMN_INDEX, StringConditionType.CONTAINS)
&& ProblemsView.testProblemsTreeItemForStringCondition(treeItem, pathStartsWith,
ProblemsView.PROBLEMS_PATH_COLUMN_INDEX, StringConditionType.STARTS_WITH)
&& ProblemsView.testProblemsTreeItemForStringCondition(treeItem, resourceText,
14 years, 1 month