JBoss Tools SVN: r41801 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-07 20:45:13 -0400 (Thu, 07 Jun 2012)
New Revision: 41801
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
Log:
JBIDE-12129
https://issues.jboss.org/browse/JBIDE-12129
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-06-07 22:11:32 UTC (rev 41800)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-06-08 00:45:13 UTC (rev 41801)
@@ -307,6 +307,9 @@
displaySubtask(JSFValidationMessage.VALIDATING_PROJECT, new String[]{projectName});
IPath webContentPath = WebUtils.getFirstWebContentPath(project);
+ if(webContentPath == null) {
+ return OK_STATUS;
+ }
IFolder webInf = null;
try {
13 years, 4 months
JBoss Tools SVN: r41800 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-07 18:11:32 -0400 (Thu, 07 Jun 2012)
New Revision: 41800
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-12135
https://issues.jboss.org/browse/JBIDE-12135
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-07 22:00:30 UTC (rev 41799)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-07 22:11:32 UTC (rev 41800)
@@ -113,7 +113,9 @@
public void update() {
getAnnotationModel();
fFile = (fEditor != null && fEditor.getEditorInput() instanceof IFileEditorInput ? ((IFileEditorInput)fEditor.getEditorInput()).getFile() : null);
- fCompilationUnit = EclipseUtil.getCompilationUnit(fFile);
+ if(fFile != null) {
+ fCompilationUnit = EclipseUtil.getCompilationUnit(fFile);
+ }
}
protected IAnnotationModel getAnnotationModel() {
13 years, 4 months
JBoss Tools SVN: r41799 - trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-07 18:00:30 -0400 (Thu, 07 Jun 2012)
New Revision: 41799
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java
Log:
JBIDE-12135
https://issues.jboss.org/browse/JBIDE-12135
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java 2012-06-07 21:48:26 UTC (rev 41798)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/helpers/OpenRuleHelper.java 2012-06-07 22:00:30 UTC (rev 41799)
@@ -55,20 +55,21 @@
if(webinf == null) return null;
XModelObject pagesXML = webinf.getChildByPath("pages.xml"); //$NON-NLS-1$
if(pagesXML == null) return null;
- XModelObject pagesFolder = pagesXML.getChildByPath("Pages");
+ XModelObject pagesFolder = pagesXML.getChildByPath("Pages"); //$NON-NLS-1$
+ if(pagesFolder == null) return null; //happens when pages.xml is broken
XModelObject[] ps = pagesFolder.getChildren();
for (int i = 0; i < ps.length; i++) {
- String viewId = ps[i].getAttributeValue("view id");
+ String viewId = ps[i].getAttributeValue("view id"); //$NON-NLS-1$
if(!isPatternMatches(viewId, viewPath)) continue;
XModelObject[] ns = ps[i].getChildren();
for (int j = 0; j < ns.length; j++) {
String entity = ns[j].getModelEntity().getName();
- if(!entity.startsWith("SeamPageNavigation")) continue;
+ if(!entity.startsWith("SeamPageNavigation")) continue; //$NON-NLS-1$
if(entity.startsWith("SeamPageNavigationRule")) continue;
XModelObject[] rs = ns[j].getChildren();
for (int k = 0; k < rs.length; k++) {
- String a = rs[k].getAttributeValue("if outcome");
+ String a = rs[k].getAttributeValue("if outcome"); //$NON-NLS-1$
if(a != null && a.equals(action)) {
//TODO compare match length
return rs[k];
13 years, 4 months
JBoss Tools SVN: r41798 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard: appimport and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-07 17:48:26 -0400 (Thu, 07 Jun 2012)
New Revision: 41798
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/GitCloningSettingsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
Log:
[JBIDE-12112] moved settings file creation to import strategies, corrected validation in UI
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-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -18,6 +18,7 @@
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
@@ -57,17 +58,19 @@
public class GitCloningSettingsWizardPage extends AbstractOpenShiftWizardPage implements IWizardPage {
private GitCloningSettingsWizardPageModel pageModel;
+ private IOpenShiftExpressWizardModel wizardModel;
private Button useDefaultRemoteNameButton;
private Button useDefaultRepoPathButton;
private Text remoteNameText;
private Label remoteNameLabel;
- public GitCloningSettingsWizardPage(OpenShiftExpressApplicationWizard wizard, IOpenShiftExpressWizardModel model) {
+ public GitCloningSettingsWizardPage(OpenShiftExpressApplicationWizard wizard, IOpenShiftExpressWizardModel wizardModel) {
super(
"Import an existing OpenShift application",
"Configure the cloning settings by specifying the clone destination if you create a new project, and the git remote name if you're using an existing project.",
"Cloning settings", wizard);
- this.pageModel = new GitCloningSettingsWizardPageModel(model);
+ this.pageModel = new GitCloningSettingsWizardPageModel(wizardModel);
+ this.wizardModel = wizardModel;
}
@Override
@@ -166,10 +169,11 @@
// move focus to the project name text control when choosing the 'Use an
// existing project' option.
useDefaultRemoteNameButton.addSelectionListener(onDefaultRemoteNameUnchecked());
+ final IObservableValue projectNameModelObservable =
+ BeanProperties.value(IOpenShiftExpressWizardModel.PROJECT_NAME).observe(wizardModel);
dbc.addValidationStatusProvider(
- new RemoteNameValidationStatusProvider(
- useDefaultRemoteNameObservable, remoteNameTextObservable));
+ new RemoteNameValidationStatusProvider(remoteNameTextObservable, projectNameModelObservable));
Link sshPrefsLink = new Link(parent, SWT.NONE);
sshPrefsLink.setText("Make sure your SSH key used with the domain is listed in <a>SSH2 Preferences</a>.");
@@ -291,40 +295,43 @@
*/
class RemoteNameValidationStatusProvider extends MultiValidator {
- private final IObservableValue isDefaultRemoteNameObservable;
private final IObservableValue remoteNameObservable;
+ private final IObservableValue projectNameObservable;
- public RemoteNameValidationStatusProvider(IObservableValue isDefaultRemoteName,
- IObservableValue remoteNameTextObservable) {
- this.isDefaultRemoteNameObservable = isDefaultRemoteName;
+ public RemoteNameValidationStatusProvider(final IObservableValue remoteNameTextObservable, final IObservableValue projectNameObservable) {
this.remoteNameObservable = remoteNameTextObservable;
+ this.projectNameObservable = projectNameObservable;
}
@Override
protected IStatus validate() {
IStatus status = Status.OK_STATUS;
- Boolean isDefaultRemoteName = (Boolean) isDefaultRemoteNameObservable.getValue();
String remoteName = (String) remoteNameObservable.getValue();
+ String projectName = (String) projectNameObservable.getValue();
// skip the validation if the user wants to create a new project.
// The name and state of the existing project do
// not matter...
- if (isDefaultRemoteName == null
- || !isDefaultRemoteName) {
- if (StringUtils.isEmpty(remoteName)) {
- return OpenShiftUIActivator.createErrorStatus(
- "The custom remote name must not be empty.");
- } else if (!remoteName.matches("\\S+")) {
- return OpenShiftUIActivator.createErrorStatus(
- "The custom remote name must not contain spaces.");
- } else if (hasRemoteName(remoteName, pageModel.getProject())) {
- return OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "The existing project already has a remote named {0}.", remoteName));
- }
+ if (StringUtils.isEmpty(remoteName)) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "The custom remote name must not be empty.");
+ } else if (!remoteName.matches("\\S+")) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "The custom remote name must not contain spaces.");
+ } else if (hasRemoteName(remoteName, getProject(projectName))) {
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "The existing project already has a remote named {0}.", remoteName));
}
return status;
}
+ public IProject getProject(final String projectName) {
+ if (StringUtils.isEmpty(projectName)) {
+ return null;
+ }
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ }
+
private boolean hasRemoteName(String remoteName, IProject project) {
try {
if (project == null
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-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -17,7 +17,6 @@
import java.beans.PropertyChangeListener;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
@@ -82,7 +81,12 @@
} else {
setRepositoryPath(IOpenShiftExpressWizardModel.DEFAULT_REPOSITORY_PATH);
}
- }
+ }
+ if(wizardModel.isExistingProject()) {
+ setRemoteName(IOpenShiftExpressWizardModel.EXISTING_PROJECT_REMOTE_NAME_DEFAULT);
+ } else {
+ setRemoteName(IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
+ }
}
};
}
@@ -170,13 +174,4 @@
return useDefaultRemoteName;
}
- public IProject getProject() {
- String projectName = wizardModel.getProjectName();
- if (projectName == null) {
- return null;
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -61,7 +61,7 @@
private static final int APP_CREATE_TIMEOUT = 6 * 60 * 1000;
private static final int APP_WAIT_TIMEOUT = 10 * 60 * 1000;
private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000;
- private static final int IMPORT_TIMEOUT = 1 * 60 * 1000;
+ private static final int IMPORT_TIMEOUT = 5 * 60 * 1000;
private final boolean skipCredentialsPage;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -6,8 +6,6 @@
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IProject;
@@ -74,33 +72,17 @@
@Override
public void importProject(IProgressMonitor monitor) throws OpenShiftException, CoreException, InterruptedException,
URISyntaxException, InvocationTargetException, IOException {
- List<IProject> importedProjects =
+ IProject importedProject =
new ImportNewProject(
getProjectName()
, getApplication()
, getRemoteName()
- , getRepositoryFile())
+ , getRepositoryFile()
+ , getUser())
.execute(monitor);
- addSettingsFiles(importedProjects);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, importedProject);
}
- private void addSettingsFiles(List<IProject> imported) {
- Iterator<IProject> i = imported.iterator();
- while (i.hasNext()) {
- IProject p = i.next();
- if (p.getFolder(".git").exists()) {
- // This is our project
- IApplication app = getApplication();
- IProject project = p;
- // Add the settings here!
- ExpressServerUtils.updateOpenshiftProjectSettings(project, app,
- getUser(), getRemoteName(), ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT);
- return;
- }
- }
- }
-
/**
* Enables the user chosen, unshared project to be used on the chosen
* OpenShift application. Clones the application git repository, copies the
@@ -130,14 +112,13 @@
public void configureUnsharedProject(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
- List<IProject> importedProjects = new ConfigureUnsharedProject(
+ IProject importedProject = new ConfigureUnsharedProject(
getProjectName()
, getApplication()
, getRemoteName()
, getUser())
.execute(monitor);
- addSettingsFiles(importedProjects);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, importedProject);
}
/**
@@ -169,21 +150,23 @@
public void configureGitSharedProject(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
- List<IProject> importedProjects = new ConfigureGitSharedProject(
+ IProject project = new ConfigureGitSharedProject(
getProjectName()
, getApplication()
, getRemoteName()
, getUser())
.execute(monitor);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, project);
}
- private void createServerAdapter(IProgressMonitor monitor, List<IProject> importedProjects)
+ private void createServerAdapter(IProgressMonitor monitor, IProject project)
throws OpenShiftException {
- Assert.isTrue(importedProjects.size() > 0);
if (isCreateServerAdapter()) {
- Assert.isTrue(importedProjects.size() > 0);
- IProject project = importedProjects.get(0);
+ if (project == null) {
+ throw new OpenShiftException(
+ "Could not create a server adapter for your application {0}. No project was found when importing",
+ getApplication().getName());
+ }
new ServerAdapterFactory().create(project, this, monitor);
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -33,6 +33,8 @@
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.core.GitIgnore;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.client.IApplication;
@@ -47,12 +49,15 @@
private IApplication application;
private String remoteName;
protected List<IResource> modifiedResources;
+ private UserDelegate user;
- public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName) {
+ public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName,
+ UserDelegate user) {
this.projectName = projectName;
this.application = application;
this.remoteName = remoteName;
this.modifiedResources = new ArrayList<IResource>();
+ this.user = user;
}
/**
@@ -148,6 +153,10 @@
return remoteName;
}
+ protected UserDelegate getUser() {
+ return user;
+ }
+
/**
* Marks the given resources as modified.
*
@@ -225,7 +234,7 @@
}
protected IResource setupOpenShiftMavenProfile(IProject project, IProgressMonitor monitor) throws CoreException {
- if(!OpenShiftMavenProfile.isMavenProject(project)) {
+ if (!OpenShiftMavenProfile.isMavenProject(project)) {
return null;
}
@@ -236,4 +245,35 @@
profile.addToPom(project.getName());
return profile.savePom(monitor);
}
+
+ protected IResource addSettingsFile(IProject project, IProgressMonitor monitor) {
+ monitor.subTask(NLS.bind("Adding settings to project {0}", project.getName()));
+ // This is our project
+ IApplication app = getApplication();
+ // Add the settings here!
+ ExpressServerUtils.updateOpenshiftProjectSettings(
+ project, app, getUser(), getRemoteName(), ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT);
+ return (IResource) project.getFolder(".settings");
+ }
+
+ protected IProject getSettingsProject(List<IProject> importedProjects) {
+ if (importedProjects == null) {
+ return null;
+ }
+ IProject mainProject = null;
+ if (importedProjects.size() == 1) {
+ if (EGitUtils.hasDotGitFolder(importedProjects.get(0))) {
+ mainProject = importedProjects.get(0);
+ }
+ } else {
+ for (IProject project : importedProjects) {
+ if (EGitUtils.hasDotGitFolder(project)) {
+ mainProject = project;
+ break;
+ }
+ }
+ }
+
+ return mainProject;
+ }
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -16,8 +16,6 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
import java.util.regex.Pattern;
import org.eclipse.core.resources.IProject;
@@ -50,7 +48,7 @@
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
UserDelegate user) {
- super(projectName, application, remoteName);
+ super(projectName, application, remoteName, user);
}
/**
@@ -89,7 +87,7 @@
* @see #createServerAdapterIfRequired
*/
@Override
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
IProject project = getProject();
@@ -103,11 +101,13 @@
addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor));
addToModified(setupGitIgnore(project, monitor));
addToModified(setupOpenShiftMavenProfile(project, monitor));
+ addSettingsFile(project, monitor);
+
addRemote(getRemoteName(), getApplication().getUUID(), project);
addAndCommitModifiedResource(project, monitor);
- return Collections.singletonList(project);
+ return project;
}
private void addRemote(String remoteName, String uuid, IProject project)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -14,8 +14,6 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
@@ -41,7 +39,7 @@
public ConfigureUnsharedProject(String projectName, IApplication application, String remoteName,
UserDelegate user) {
- super(projectName, application, remoteName);
+ super(projectName, application, remoteName, user);
}
/**
@@ -80,7 +78,7 @@
* @see #createServerAdapterIfRequired
*/
@Override
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
// File repositoryFile =
@@ -95,10 +93,11 @@
copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
setupGitIgnore(project, monitor);
setupOpenShiftMavenProfile(project, monitor);
+ addSettingsFile(project, monitor);
shareProject(project, monitor);
addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project));
- return Collections.singletonList(project);
+ return project;
}
private void shareProject(IProject project, IProgressMonitor monitor) throws CoreException {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard.appimport;
-import java.util.List;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -28,6 +26,6 @@
* @return the list of projects that were imported to the workspace.
* @throws Exception
*/
- public List<IProject> execute(IProgressMonitor monitor) throws Exception;
+ public IProject execute(IProgressMonitor monitor) throws Exception;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-07 21:42:36 UTC (rev 41797)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-07 21:48:26 UTC (rev 41798)
@@ -25,6 +25,7 @@
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.ImportFailedException;
import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.GeneralProjectImportOperation;
@@ -41,8 +42,8 @@
private File cloneDestination;
public ImportNewProject(String projectName, IApplication application, String remoteName,
- File cloneDestination) {
- super(projectName, application, remoteName);
+ File cloneDestination, UserDelegate user) {
+ super(projectName, application, remoteName, user);
this.cloneDestination = cloneDestination;
}
@@ -58,7 +59,7 @@
* @throws InvocationTargetException
* @throws IOException
*/
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, CoreException, InterruptedException, URISyntaxException,
InvocationTargetException, IOException {
if (cloneDestinationExists()) {
@@ -82,11 +83,12 @@
connectToGitRepo(importedProjects, repositoryFolder, monitor);
// TODO: handle multiple projects (is this really possible?)
- IProject project = importedProjects.get(0);
+ IProject project = getSettingsProject(importedProjects);
addToModified(setupGitIgnore(project, monitor));
+ addSettingsFile(project, monitor);
addAndCommitModifiedResource(project, monitor);
- return importedProjects;
+ return getSettingsProject(importedProjects);
}
@SuppressWarnings("unused")
13 years, 4 months
JBoss Tools SVN: r41797 - in branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard: appimport and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-07 17:42:36 -0400 (Thu, 07 Jun 2012)
New Revision: 41797
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
Log:
[JBIDE-12112] moved settings file creation to import strategies, corrected validation in UI
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -18,6 +18,7 @@
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
@@ -57,17 +58,19 @@
public class GitCloningSettingsWizardPage extends AbstractOpenShiftWizardPage implements IWizardPage {
private GitCloningSettingsWizardPageModel pageModel;
+ private IOpenShiftExpressWizardModel wizardModel;
private Button useDefaultRemoteNameButton;
private Button useDefaultRepoPathButton;
private Text remoteNameText;
private Label remoteNameLabel;
- public GitCloningSettingsWizardPage(OpenShiftExpressApplicationWizard wizard, IOpenShiftExpressWizardModel model) {
+ public GitCloningSettingsWizardPage(OpenShiftExpressApplicationWizard wizard, IOpenShiftExpressWizardModel wizardModel) {
super(
"Import an existing OpenShift application",
"Configure the cloning settings by specifying the clone destination if you create a new project, and the git remote name if you're using an existing project.",
"Cloning settings", wizard);
- this.pageModel = new GitCloningSettingsWizardPageModel(model);
+ this.pageModel = new GitCloningSettingsWizardPageModel(wizardModel);
+ this.wizardModel = wizardModel;
}
@Override
@@ -166,10 +169,11 @@
// move focus to the project name text control when choosing the 'Use an
// existing project' option.
useDefaultRemoteNameButton.addSelectionListener(onDefaultRemoteNameUnchecked());
+ final IObservableValue projectNameModelObservable =
+ BeanProperties.value(IOpenShiftExpressWizardModel.PROJECT_NAME).observe(wizardModel);
dbc.addValidationStatusProvider(
- new RemoteNameValidationStatusProvider(
- useDefaultRemoteNameObservable, remoteNameTextObservable));
+ new RemoteNameValidationStatusProvider(remoteNameTextObservable, projectNameModelObservable));
Link sshPrefsLink = new Link(parent, SWT.NONE);
sshPrefsLink.setText("Make sure your SSH key used with the domain is listed in <a>SSH2 Preferences</a>.");
@@ -291,40 +295,43 @@
*/
class RemoteNameValidationStatusProvider extends MultiValidator {
- private final IObservableValue isDefaultRemoteNameObservable;
private final IObservableValue remoteNameObservable;
+ private final IObservableValue projectNameObservable;
- public RemoteNameValidationStatusProvider(IObservableValue isDefaultRemoteName,
- IObservableValue remoteNameTextObservable) {
- this.isDefaultRemoteNameObservable = isDefaultRemoteName;
+ public RemoteNameValidationStatusProvider(final IObservableValue remoteNameTextObservable, final IObservableValue projectNameObservable) {
this.remoteNameObservable = remoteNameTextObservable;
+ this.projectNameObservable = projectNameObservable;
}
@Override
protected IStatus validate() {
IStatus status = Status.OK_STATUS;
- Boolean isDefaultRemoteName = (Boolean) isDefaultRemoteNameObservable.getValue();
String remoteName = (String) remoteNameObservable.getValue();
+ String projectName = (String) projectNameObservable.getValue();
// skip the validation if the user wants to create a new project.
// The name and state of the existing project do
// not matter...
- if (isDefaultRemoteName == null
- || !isDefaultRemoteName) {
- if (StringUtils.isEmpty(remoteName)) {
- return OpenShiftUIActivator.createErrorStatus(
- "The custom remote name must not be empty.");
- } else if (!remoteName.matches("\\S+")) {
- return OpenShiftUIActivator.createErrorStatus(
- "The custom remote name must not contain spaces.");
- } else if (hasRemoteName(remoteName, pageModel.getProject())) {
- return OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "The existing project already has a remote named {0}.", remoteName));
- }
+ if (StringUtils.isEmpty(remoteName)) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "The custom remote name must not be empty.");
+ } else if (!remoteName.matches("\\S+")) {
+ return OpenShiftUIActivator.createErrorStatus(
+ "The custom remote name must not contain spaces.");
+ } else if (hasRemoteName(remoteName, getProject(projectName))) {
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "The existing project already has a remote named {0}.", remoteName));
}
return status;
}
+ public IProject getProject(final String projectName) {
+ if (StringUtils.isEmpty(projectName)) {
+ return null;
+ }
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ }
+
private boolean hasRemoteName(String remoteName, IProject project) {
try {
if (project == null
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -17,7 +17,6 @@
import java.beans.PropertyChangeListener;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
@@ -82,7 +81,12 @@
} else {
setRepositoryPath(IOpenShiftExpressWizardModel.DEFAULT_REPOSITORY_PATH);
}
- }
+ }
+ if(wizardModel.isExistingProject()) {
+ setRemoteName(IOpenShiftExpressWizardModel.EXISTING_PROJECT_REMOTE_NAME_DEFAULT);
+ } else {
+ setRemoteName(IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
+ }
}
};
}
@@ -170,13 +174,4 @@
return useDefaultRemoteName;
}
- public IProject getProject() {
- String projectName = wizardModel.getProjectName();
- if (projectName == null) {
- return null;
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -61,7 +61,7 @@
private static final int APP_CREATE_TIMEOUT = 6 * 60 * 1000;
private static final int APP_WAIT_TIMEOUT = 10 * 60 * 1000;
private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000;
- private static final int IMPORT_TIMEOUT = 1 * 60 * 1000;
+ private static final int IMPORT_TIMEOUT = 5 * 60 * 1000;
private final boolean skipCredentialsPage;
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -6,8 +6,6 @@
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IProject;
@@ -74,33 +72,17 @@
@Override
public void importProject(IProgressMonitor monitor) throws OpenShiftException, CoreException, InterruptedException,
URISyntaxException, InvocationTargetException, IOException {
- List<IProject> importedProjects =
+ IProject importedProject =
new ImportNewProject(
getProjectName()
, getApplication()
, getRemoteName()
- , getRepositoryFile())
+ , getRepositoryFile()
+ , getUser())
.execute(monitor);
- addSettingsFiles(importedProjects);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, importedProject);
}
- private void addSettingsFiles(List<IProject> imported) {
- Iterator<IProject> i = imported.iterator();
- while (i.hasNext()) {
- IProject p = i.next();
- if (p.getFolder(".git").exists()) {
- // This is our project
- IApplication app = getApplication();
- IProject project = p;
- // Add the settings here!
- ExpressServerUtils.updateOpenshiftProjectSettings(project, app,
- getUser(), getRemoteName(), ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT);
- return;
- }
- }
- }
-
/**
* Enables the user chosen, unshared project to be used on the chosen
* OpenShift application. Clones the application git repository, copies the
@@ -130,14 +112,13 @@
public void configureUnsharedProject(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
- List<IProject> importedProjects = new ConfigureUnsharedProject(
+ IProject importedProject = new ConfigureUnsharedProject(
getProjectName()
, getApplication()
, getRemoteName()
, getUser())
.execute(monitor);
- addSettingsFiles(importedProjects);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, importedProject);
}
/**
@@ -169,21 +150,23 @@
public void configureGitSharedProject(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
- List<IProject> importedProjects = new ConfigureGitSharedProject(
+ IProject project = new ConfigureGitSharedProject(
getProjectName()
, getApplication()
, getRemoteName()
, getUser())
.execute(monitor);
- createServerAdapter(monitor, importedProjects);
+ createServerAdapter(monitor, project);
}
- private void createServerAdapter(IProgressMonitor monitor, List<IProject> importedProjects)
+ private void createServerAdapter(IProgressMonitor monitor, IProject project)
throws OpenShiftException {
- Assert.isTrue(importedProjects.size() > 0);
if (isCreateServerAdapter()) {
- Assert.isTrue(importedProjects.size() > 0);
- IProject project = importedProjects.get(0);
+ if (project == null) {
+ throw new OpenShiftException(
+ "Could not create a server adapter for your application {0}. No project was found when importing",
+ getApplication().getName());
+ }
new ServerAdapterFactory().create(project, this, monitor);
}
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -33,6 +33,8 @@
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.core.GitIgnore;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.client.IApplication;
@@ -47,12 +49,15 @@
private IApplication application;
private String remoteName;
protected List<IResource> modifiedResources;
+ private UserDelegate user;
- public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName) {
+ public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName,
+ UserDelegate user) {
this.projectName = projectName;
this.application = application;
this.remoteName = remoteName;
this.modifiedResources = new ArrayList<IResource>();
+ this.user = user;
}
/**
@@ -148,6 +153,10 @@
return remoteName;
}
+ protected UserDelegate getUser() {
+ return user;
+ }
+
/**
* Marks the given resources as modified.
*
@@ -225,7 +234,7 @@
}
protected IResource setupOpenShiftMavenProfile(IProject project, IProgressMonitor monitor) throws CoreException {
- if(!OpenShiftMavenProfile.isMavenProject(project)) {
+ if (!OpenShiftMavenProfile.isMavenProject(project)) {
return null;
}
@@ -236,4 +245,35 @@
profile.addToPom(project.getName());
return profile.savePom(monitor);
}
+
+ protected IResource addSettingsFile(IProject project, IProgressMonitor monitor) {
+ monitor.subTask(NLS.bind("Adding settings to project {0}", project.getName()));
+ // This is our project
+ IApplication app = getApplication();
+ // Add the settings here!
+ ExpressServerUtils.updateOpenshiftProjectSettings(
+ project, app, getUser(), getRemoteName(), ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT);
+ return (IResource) project.getFolder(".settings");
+ }
+
+ protected IProject getSettingsProject(List<IProject> importedProjects) {
+ if (importedProjects == null) {
+ return null;
+ }
+ IProject mainProject = null;
+ if (importedProjects.size() == 1) {
+ if (EGitUtils.hasDotGitFolder(importedProjects.get(0))) {
+ mainProject = importedProjects.get(0);
+ }
+ } else {
+ for (IProject project : importedProjects) {
+ if (EGitUtils.hasDotGitFolder(project)) {
+ mainProject = project;
+ break;
+ }
+ }
+ }
+
+ return mainProject;
+ }
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -16,8 +16,6 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
import java.util.regex.Pattern;
import org.eclipse.core.resources.IProject;
@@ -50,7 +48,7 @@
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
UserDelegate user) {
- super(projectName, application, remoteName);
+ super(projectName, application, remoteName, user);
}
/**
@@ -89,7 +87,7 @@
* @see #createServerAdapterIfRequired
*/
@Override
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
IProject project = getProject();
@@ -103,11 +101,13 @@
addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor));
addToModified(setupGitIgnore(project, monitor));
addToModified(setupOpenShiftMavenProfile(project, monitor));
+ addSettingsFile(project, monitor);
+
addRemote(getRemoteName(), getApplication().getUUID(), project);
addAndCommitModifiedResource(project, monitor);
- return Collections.singletonList(project);
+ return project;
}
private void addRemote(String remoteName, String uuid, IProject project)
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -14,8 +14,6 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
@@ -41,7 +39,7 @@
public ConfigureUnsharedProject(String projectName, IApplication application, String remoteName,
UserDelegate user) {
- super(projectName, application, remoteName);
+ super(projectName, application, remoteName, user);
}
/**
@@ -80,7 +78,7 @@
* @see #createServerAdapterIfRequired
*/
@Override
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, InvocationTargetException, InterruptedException, IOException, CoreException,
URISyntaxException {
// File repositoryFile =
@@ -95,10 +93,11 @@
copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
setupGitIgnore(project, monitor);
setupOpenShiftMavenProfile(project, monitor);
+ addSettingsFile(project, monitor);
shareProject(project, monitor);
addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project));
- return Collections.singletonList(project);
+ return project;
}
private void shareProject(IProject project, IProgressMonitor monitor) throws CoreException {
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/IImportApplicationStrategy.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard.appimport;
-import java.util.List;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -28,6 +26,6 @@
* @return the list of projects that were imported to the workspace.
* @throws Exception
*/
- public List<IProject> execute(IProgressMonitor monitor) throws Exception;
+ public IProject execute(IProgressMonitor monitor) throws Exception;
}
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-07 21:35:30 UTC (rev 41796)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-07 21:42:36 UTC (rev 41797)
@@ -25,6 +25,7 @@
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.ImportFailedException;
import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.GeneralProjectImportOperation;
@@ -41,8 +42,8 @@
private File cloneDestination;
public ImportNewProject(String projectName, IApplication application, String remoteName,
- File cloneDestination) {
- super(projectName, application, remoteName);
+ File cloneDestination, UserDelegate user) {
+ super(projectName, application, remoteName, user);
this.cloneDestination = cloneDestination;
}
@@ -58,7 +59,7 @@
* @throws InvocationTargetException
* @throws IOException
*/
- public List<IProject> execute(IProgressMonitor monitor)
+ public IProject execute(IProgressMonitor monitor)
throws OpenShiftException, CoreException, InterruptedException, URISyntaxException,
InvocationTargetException, IOException {
if (cloneDestinationExists()) {
@@ -82,11 +83,12 @@
connectToGitRepo(importedProjects, repositoryFolder, monitor);
// TODO: handle multiple projects (is this really possible?)
- IProject project = importedProjects.get(0);
+ IProject project = getSettingsProject(importedProjects);
addToModified(setupGitIgnore(project, monitor));
+ addSettingsFile(project, monitor);
addAndCommitModifiedResource(project, monitor);
- return importedProjects;
+ return getSettingsProject(importedProjects);
}
@SuppressWarnings("unused")
13 years, 4 months
JBoss Tools SVN: r41796 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-07 17:35:30 -0400 (Thu, 07 Jun 2012)
New Revision: 41796
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
[JBIDE-12131] using util method (which queries server & override) instead of server directly
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-07 21:34:36 UTC (rev 41795)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-07 21:35:30 UTC (rev 41796)
@@ -195,8 +195,7 @@
} catch( CoreException ce) {
// What to do in this situation??
}
- String remoteName = behaviour.getServer().getAttribute(ExpressServerUtils.ATTRIBUTE_REMOTE_NAME,
- ExpressServerUtils.ATTRIBUTE_REMOTE_NAME_DEFAULT);
+ String remoteName = ExpressServerUtils.getExpressRemoteName(behaviour.getServer().createWorkingCopy());
PushOperationResult result = null;
boolean committed = false;
Repository repo = EGitUtils.getRepository(p);
13 years, 4 months
JBoss Tools SVN: r41795 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-06-07 17:34:36 -0400 (Thu, 07 Jun 2012)
New Revision: 41795
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
[JBIDE-12131] using util method (which queries server & override) instead of server directly
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-07 21:34:19 UTC (rev 41794)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-07 21:34:36 UTC (rev 41795)
@@ -195,8 +195,7 @@
} catch( CoreException ce) {
// What to do in this situation??
}
- String remoteName = behaviour.getServer().getAttribute(ExpressServerUtils.ATTRIBUTE_REMOTE_NAME,
- ExpressServerUtils.ATTRIBUTE_REMOTE_NAME_DEFAULT);
+ String remoteName = ExpressServerUtils.getExpressRemoteName(behaviour.getServer().createWorkingCopy());
PushOperationResult result = null;
boolean committed = false;
Repository repo = EGitUtils.getRepository(p);
13 years, 4 months
JBoss Tools SVN: r41794 - in branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui: internal/wizard and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-06-07 17:34:19 -0400 (Thu, 07 Jun 2012)
New Revision: 41794
Modified:
branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java
branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassWizardPage.java
branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java
Log:
JBIDE-12125 - Cannot invoke New Portlet wizard if no Dynamic Web Project is present
Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2012-06-07 21:27:20 UTC (rev 41793)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2012-06-07 21:34:19 UTC (rev 41794)
@@ -16,6 +16,7 @@
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -82,12 +83,20 @@
}
public static IFile getPortletXmlFile(IProject project) {
+ try {
+ if (project == null || !project.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
+ return null;
+ }
+ } catch (CoreException e) {
+ log(e);
+ return null;
+ }
IVirtualComponent component = ComponentCore.createComponent(project);
IVirtualFile portletVirtualFile = component.getRootFolder().getFile(
IPortletConstants.CONFIG_PATH);
if (!portletVirtualFile.getUnderlyingFile().exists()) {
- log(new RuntimeException(Messages.PortletUIActivator_The_portlet_xml_file_doesnt_exist));
+ //log(new RuntimeException(Messages.PortletUIActivator_The_portlet_xml_file_doesnt_exist));
return null;
}
Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassWizardPage.java 2012-06-07 21:27:20 UTC (rev 41793)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassWizardPage.java 2012-06-07 21:34:19 UTC (rev 41794)
@@ -25,6 +25,7 @@
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider;
import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
@@ -42,9 +43,11 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.eclipse.wst.common.project.facet.core.internal.FacetedProject;
import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.ui.Messages;
import org.jboss.tools.portlet.ui.MultiSelectFilteredFileSelectionDialog;
@@ -83,8 +86,7 @@
protected boolean isProjectValid(IProject project) {
boolean result;
try {
- result = project.isAccessible() &&
- project.hasNature(JavaCore.NATURE_ID);
+ return FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.PORTLET_FACET_ID);
} catch (CoreException ce) {
result = false;
}
Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java 2012-06-07 21:27:20 UTC (rev 41793)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/xpl/NewJavaClassWizardPageEx.java 2012-06-07 21:34:19 UTC (rev 41794)
@@ -80,6 +80,8 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.ui.PortletUIActivator;
/**
@@ -239,9 +241,7 @@
protected boolean isProjectValid(IProject project) {
boolean result;
try {
- result = project.isAccessible() &&
- project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
- J2EEProjectUtilities.getJ2EEProjectType(project).equals(projectType);
+ return FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.JSFPORTLET_FACET_ID);
} catch (CoreException ce) {
result = false;
}
13 years, 4 months
JBoss Tools SVN: r41792 - in trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core: jdt and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-06-07 17:17:56 -0400 (Thu, 07 Jun 2012)
New Revision: 41792
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java
Log:
Fixed - JBIDE-12128
NPE when moving JAX-RS resource into another package
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java 2012-06-07 21:15:56 UTC (rev 41791)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/ResourceChangedProcessor.java 2012-06-07 21:17:56 UTC (rev 41792)
@@ -694,12 +694,14 @@
int flags = existingMethod.mergeAnnotations(matchingMethod.getAnnotations());
final CompilationUnit matchingResourceAST = CompilationUnitsRepository.getInstance().getAST(matchingResource.getResource());
final JavaMethodSignature matchingResourceMethodSignature = JdtUtils.resolveMethodSignature(matchingMethod.getJavaElement(), matchingResourceAST);
- flags += existingMethod.update(matchingResourceMethodSignature);
- if ((flags & F_ELEMENT_KIND) > 0 && existingMethod.getKind() == EnumKind.UNDEFINED) {
- metamodel.remove(existingMethod);
- changes.add(new JaxrsElementDelta(existingMethod, REMOVED));
- } else if (flags > 0) {
- changes.add(new JaxrsElementDelta(existingMethod, CHANGED, flags));
+ if(matchingResourceMethodSignature != null) {
+ flags += existingMethod.update(matchingResourceMethodSignature);
+ if ((flags & F_ELEMENT_KIND) > 0 && existingMethod.getKind() == EnumKind.UNDEFINED) {
+ metamodel.remove(existingMethod);
+ changes.add(new JaxrsElementDelta(existingMethod, REMOVED));
+ } else if (flags > 0) {
+ changes.add(new JaxrsElementDelta(existingMethod, CHANGED, flags));
+ }
}
}
for (Entry<String, JaxrsResourceMethod> entry : removedMethods.entrySet()) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-06-07 21:15:56 UTC (rev 41791)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-06-07 21:17:56 UTC (rev 41792)
@@ -582,7 +582,16 @@
return methodsVisitor.getMethodSignatures();
}
+ /**
+ * Returns the method signature for the given method with the given AST.
+ * @param method the java method
+ * @param ast the associated Compilation Unit AST
+ * @return the JavaMethodSignature or null if the given AST is null.
+ */
public static JavaMethodSignature resolveMethodSignature(IMethod method, CompilationUnit ast) {
+ if(ast == null) {
+ return null;
+ }
JavaMethodSignaturesVisitor methodsVisitor = new JavaMethodSignaturesVisitor(method);
ast.accept(methodsVisitor);
return methodsVisitor.getMethodSignature();
13 years, 4 months
JBoss Tools SVN: r41791 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-06-07 17:15:56 -0400 (Thu, 07 Jun 2012)
New Revision: 41791
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml
Log:
Fixed - JBIDE-12105
Weird behaviour after selecting content proposal in PathParam annotation
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml 2012-06-07 21:13:09 UTC (rev 41790)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml 2012-06-07 21:15:56 UTC (rev 41791)
@@ -286,9 +286,9 @@
activate="true"
categoryId="org.eclipse.jdt.ui.defaultProposalCategory"
class="org.jboss.tools.ws.jaxrs.ui.contentassist.PathParamAnnotationValueCompletionProposalComputer">
- <partition
+ <!--partition
type="__dftl_partition_content_type">
- </partition>
+ </partition-->
<partition
type="__java_string">
</partition>
13 years, 4 months