JBoss Tools SVN: r41648 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-01 18:18:33 -0400 (Fri, 01 Jun 2012)
New Revision: 41648
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
Log:
JBIDE-11434 contextInformation must not be null so we return empty list.
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-01 22:16:33 UTC (rev 41647)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-01 22:18:33 UTC (rev 41648)
@@ -174,7 +174,7 @@
@Override
public final List<IContextInformation> computeContextInformation(final ContentAssistInvocationContext context,
final IProgressMonitor monitor) {
- return null;
+ return Collections.emptyList();
}
/** {@inheritDoc} */
11 years, 12 months
JBoss Tools SVN: r41647 - branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-01 18:16:33 -0400 (Fri, 01 Jun 2012)
New Revision: 41647
Modified:
branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
Log:
JBIDE-11434 contextInformation must not be null so we return empty list.
Modified: branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-01 21:30:33 UTC (rev 41646)
+++ branches/jbosstools-3.3.x/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-06-01 22:16:33 UTC (rev 41647)
@@ -174,7 +174,7 @@
@Override
public final List<IContextInformation> computeContextInformation(final ContentAssistInvocationContext context,
final IProgressMonitor monitor) {
- return null;
+ return Collections.emptyList();
}
/** {@inheritDoc} */
11 years, 12 months
JBoss Tools SVN: r41646 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2012-06-01 17:30:33 -0400 (Fri, 01 Jun 2012)
New Revision: 41646
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-01 20:55:18 UTC (rev 41645)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-01 21:30:33 UTC (rev 41646)
@@ -151,7 +151,7 @@
if(model instanceof AbstractMarkerAnnotationModel) {
AbstractMarkerAnnotationModel anModel = ((AbstractMarkerAnnotationModel)model);
synchronized (anModel.getLockObject()) {
- Iterator iterator = anModel.getAnnotationIterator(reference.getStartPosition(), reference.getLength(), false, false);
+ Iterator iterator = anModel.getAnnotationIterator(reference.getStartPosition(), reference.getLength(), true, true);
Set<MarkerAnnotation> annotationsToRemove = new HashSet<MarkerAnnotation>();
// Map<Annotation, Position> newAnnotations = new HashMap<Annotation, Position>();
while (iterator.hasNext()) {
11 years, 12 months
JBoss Tools SVN: r41645 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/action and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-06-01 16:55:18 -0400 (Fri, 01 Jun 2012)
New Revision: 41645
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/ui/action/ApplicationPortForwardingAction.java
Log:
JBIDE-12079 actually report an error without NPE when magic deployments folder does not exist
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-01 20:53:04 UTC (rev 41644)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-06-01 20:55:18 UTC (rev 41645)
@@ -66,9 +66,17 @@
String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
IContainer destFolder = "".equals(destinationFolder) ? magicProject : (IContainer)magicProject.findMember(new Path(destinationFolder));
if( destFolder == null || !destFolder.isAccessible()) {
+ StringBuffer missingPath = new StringBuffer("");
+ if(destFolder==null) {
+ missingPath.append(magicProject.getName());
+ missingPath.append("/");
+ missingPath.append(destinationFolder);
+ } else {
+ missingPath.append(destFolder.getName());
+ }
throw new CoreException(new Status(IStatus.ERROR,
OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), destFolder.getProjectRelativePath())));
+ NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java 2012-06-01 20:53:04 UTC (rev 41644)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java 2012-06-01 20:55:18 UTC (rev 41645)
@@ -94,5 +94,6 @@
dialog.open();
}
});
+
}
}
11 years, 12 months
JBoss Tools SVN: r41644 - 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: max.andersen(a)jboss.com
Date: 2012-06-01 16:53:04 -0400 (Fri, 01 Jun 2012)
New Revision: 41644
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-12079 actually report an error without NPE when magic deployments folder does not exist
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-01 18:12:58 UTC (rev 41643)
+++ 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-01 20:53:04 UTC (rev 41644)
@@ -66,9 +66,17 @@
String destinationFolder = ExpressServerUtils.getExpressDeployFolder(behaviour.getServer());
IContainer destFolder = "".equals(destinationFolder) ? magicProject : (IContainer)magicProject.findMember(new Path(destinationFolder));
if( destFolder == null || !destFolder.isAccessible()) {
+ StringBuffer missingPath = new StringBuffer("");
+ if(destFolder==null) {
+ missingPath.append(magicProject.getName());
+ missingPath.append("/");
+ missingPath.append(destinationFolder);
+ } else {
+ missingPath.append(destFolder.getName());
+ }
throw new CoreException(new Status(IStatus.ERROR,
OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), destFolder.getProjectRelativePath())));
+ NLS.bind(ExpressMessages.publishFailMissingFolder, behaviour.getServer().getName(), missingPath)));
}
}
11 years, 12 months
JBoss Tools SVN: r41643 - 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-06-01 14:12:58 -0400 (Fri, 01 Jun 2012)
New Revision: 41643
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-11081] corrected warning message
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-01 18:12:48 UTC (rev 41642)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-06-01 18:12:58 UTC (rev 41643)
@@ -303,11 +303,11 @@
} else if (!wizardModel.isGitSharedProject()) {
if (!askForConfirmation(
NLS.bind(
- "OpenShift application \"{0}\" will be enabled on project \"{1}\" by "
- + "copying OpenShift configuration and enabling Git for the project.\n"
- + "This cannot be undone.\n"
- + "Furthermore publishing to your OpenShift app will eventually override existing content.\n"
- + "\nDo you wish to continue ?",
+ "OpenShift application {0} will be enabled on project {1} by copying OpenShift configuration " +
+ "from server to local project and connecting local project to OpenShift Git repository.\n" +
+ "The local project will be automatically committed to local Git repository and further publishing will " +
+ "eventually override existing remote content.\n\n" +
+ "This cannot be undone. Do you wish to continue?",
wizardModel.getApplicationName(), wizardModel.getProjectName()),
wizardModel.getApplicationName())) {
return Status.CANCEL_STATUS;
@@ -316,11 +316,11 @@
} else {
if (!askForConfirmation(
NLS.bind(
- "OpenShift application \"{0}\" will be enabled on project \"{1}\" by "
- + "copying OpenShift configuration and enabling Git for the project.\n"
- + "This cannot be undone.\n"
- + "Furthermore publishing to your OpenShift app will eventually override existing content.\n"
- + "\nDo you wish to continue ?",
+ "OpenShift application {0} will be enabled on project {1} by copying OpenShift configuration " +
+ "from server to local project and connecting local project to OpenShift Git repository.\n" +
+ "The local project will be automatically committed to local Git repository and further publishing will " +
+ "eventually override existing remote content.\n\n" +
+ "This cannot be undone. Do you wish to continue?",
wizardModel.getApplicationName(), wizardModel.getProjectName()),
wizardModel.getApplicationName())) {
return Status.CANCEL_STATUS;
11 years, 12 months
JBoss Tools SVN: r41642 - branches/jbosstools-3.3.x/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-06-01 14:12:48 -0400 (Fri, 01 Jun 2012)
New Revision: 41642
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
Log:
[JBIDE-11081] corrected warning message
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-01 17:57:07 UTC (rev 41641)
+++ 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-01 18:12:48 UTC (rev 41642)
@@ -303,11 +303,11 @@
} else if (!wizardModel.isGitSharedProject()) {
if (!askForConfirmation(
NLS.bind(
- "OpenShift application \"{0}\" will be enabled on project \"{1}\" by "
- + "copying OpenShift configuration and enabling Git for the project.\n"
- + "This cannot be undone.\n"
- + "Furthermore publishing to your OpenShift app will eventually override existing content.\n"
- + "\nDo you wish to continue ?",
+ "OpenShift application {0} will be enabled on project {1} by copying OpenShift configuration " +
+ "from server to local project and connecting local project to OpenShift Git repository.\n" +
+ "The local project will be automatically committed to local Git repository and further publishing will " +
+ "eventually override existing remote content.\n\n" +
+ "This cannot be undone. Do you wish to continue?",
wizardModel.getApplicationName(), wizardModel.getProjectName()),
wizardModel.getApplicationName())) {
return Status.CANCEL_STATUS;
@@ -316,11 +316,11 @@
} else {
if (!askForConfirmation(
NLS.bind(
- "OpenShift application \"{0}\" will be enabled on project \"{1}\" by "
- + "copying OpenShift configuration and enabling Git for the project.\n"
- + "This cannot be undone.\n"
- + "Furthermore publishing to your OpenShift app will eventually override existing content.\n"
- + "\nDo you wish to continue ?",
+ "OpenShift application {0} will be enabled on project {1} by copying OpenShift configuration " +
+ "from server to local project and connecting local project to OpenShift Git repository.\n" +
+ "The local project will be automatically committed to local Git repository and further publishing will " +
+ "eventually override existing remote content.\n\n" +
+ "This cannot be undone. Do you wish to continue?",
wizardModel.getApplicationName(), wizardModel.getProjectName()),
wizardModel.getApplicationName())) {
return Status.CANCEL_STATUS;
11 years, 12 months
JBoss Tools SVN: r41641 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-06-01 13:57:07 -0400 (Fri, 01 Jun 2012)
New Revision: 41641
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-12076] added new client jar which supports offers the url property for embedded cartridges
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
11 years, 12 months
JBoss Tools SVN: r41640 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-06-01 13:55:38 -0400 (Fri, 01 Jun 2012)
New Revision: 41640
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-12076] added new client jar which supports offers the url property for embedded cartridges
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
11 years, 12 months