JBoss Tools SVN: r41586 - in branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: utils and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-05-31 14:24:48 -0400 (Thu, 31 May 2012)
New Revision: 41586
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java
Log:
[JBIDE-12034] avoiding NPE when displaying embedded cartridges that dont have an URL
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java 2012-05-31 17:13:54 UTC (rev 41585)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/propertytable/PropertyValueCellLabelProvider.java 2012-05-31 18:24:48 UTC (rev 41586)
@@ -22,6 +22,7 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.tools.common.ui.BrowserUtil;
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.TreeUtils;
/**
@@ -41,6 +42,9 @@
}
protected void createLink(IProperty property, final ViewerCell cell) {
+ if (StringUtils.isEmpty(property.getValue())) {
+ return;
+ }
final Hyperlink link = new Hyperlink((Tree) cell.getControl(),SWT.NONE); //SWT.NO_BACKGROUND
link.setBackground(cell.getBackground());
link.setForeground(JFaceResources.getColorRegistry().get(JFacePreferences.ACTIVE_HYPERLINK_COLOR));
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-05-31 17:13:54 UTC (rev 41585)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-05-31 18:24:48 UTC (rev 41586)
@@ -26,6 +26,13 @@
return "";
}
+ public static String toStringOrNull(Object value) {
+ if (value == null) {
+ return null;
+ }
+ return String.valueOf(value);
+ }
+
public static boolean isEmpty(String value) {
return value == null
|| value.length() == 0;
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java 2012-05-31 17:13:54 UTC (rev 41585)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsContentProvider.java 2012-05-31 18:24:48 UTC (rev 41586)
@@ -3,6 +3,8 @@
*/
package org.jboss.tools.openshift.express.internal.ui.wizard;
+import static org.jboss.tools.openshift.express.internal.ui.utils.StringUtils.toStringOrNull;
+
import java.net.SocketTimeoutException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -54,10 +56,10 @@
private ContainerElement createCartridges(IApplication application)
throws OpenShiftException, SocketTimeoutException {
ContainerElement cartridgesContainer = new ContainerElement("Cartridges");
- for (IEmbeddedCartridge cartridge : application.getEmbeddedCartridges()) {
+ for (IEmbeddedCartridge cartridge : application.getEmbeddedCartridges()) {
cartridgesContainer.add(
- new StringElement(cartridge.getName(), cartridge.getUrl().toString(), true,
- cartridgesContainer));
+ new StringElement(
+ cartridge.getName(), toStringOrNull(cartridge.getUrl()), true, cartridgesContainer));
}
return cartridgesContainer;
}
12 years, 7 months
JBoss Tools SVN: r41585 - trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-05-31 13:13:54 -0400 (Thu, 31 May 2012)
New Revision: 41585
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
Log:
JBIDE-12056 Exception Adding/Editing Property Definition's Value Constraint In CND Editor. Fixed same issue with add/editing default values.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 16:47:55 UTC (rev 41584)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 17:13:54 UTC (rev 41585)
@@ -1135,8 +1135,12 @@
// check for duplicate
currentDefaultValues.add(newValue);
- return CndValidator.validateDefaultValues(propDefn.getName(), propDefn.getType(), currentDefaultValues,
- accessExistingNamespacePrefixes());
+ MultiValidationStatus validationStatus = CndValidator.validateDefaultValues(propDefn.getName(),
+ propDefn.getType(),
+ currentDefaultValues,
+ accessExistingNamespacePrefixes());
+ currentDefaultValues.remove(newValue);
+ return validationStatus;
}
};
@@ -1192,7 +1196,8 @@
// check for duplicate
currentConstraints.add(newValue);
- MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(),
+ currentConstraints);
currentConstraints.remove(newValue);
return validationStatus;
}
@@ -1304,8 +1309,12 @@
// check for duplicate
currentDefaultValues.add(newValue);
- return CndValidator.validateDefaultValues(propDefn.getName(), propDefn.getType(), currentDefaultValues,
- accessExistingNamespacePrefixes());
+ MultiValidationStatus validationStatus = CndValidator.validateDefaultValues(propDefn.getName(),
+ propDefn.getType(),
+ currentDefaultValues,
+ accessExistingNamespacePrefixes());
+ currentDefaultValues.remove(newValue);
+ return validationStatus;
}
};
@@ -1381,7 +1390,10 @@
// check for duplicate
currentConstraints.add(newValue);
- return CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(),
+ currentConstraints);
+ currentConstraints.remove(newValue);
+ return validationStatus;
}
};
12 years, 7 months
JBoss Tools SVN: r41584 - in branches/jbosstools-3.3.x/modeshape: plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-05-31 12:47:55 -0400 (Thu, 31 May 2012)
New Revision: 41584
Modified:
branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java
branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties
branches/jbosstools-3.3.x/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java
Log:
JBIDE-12056 Exception Adding/Editing Property Definition's Value Constraint In CND Editor. Problem was that a value constraint was being added to an unmodifiable list. Fixed that as well as an issue when the value constraint was empty. Fixed same issues with adding/editing default values.
Modified: branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java
===================================================================
--- branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java 2012-05-31 16:08:12 UTC (rev 41583)
+++ branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java 2012-05-31 16:47:55 UTC (rev 41584)
@@ -163,6 +163,11 @@
public static String emptyValue;
/**
+ * A message indicating a property definition's value constraint is empty.
+ */
+ public static String emptyValueConstraint;
+
+ /**
* A message indicating a property definition is missing value constraints. One parameter, the property definition name, is
* required.
*/
Modified: branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
===================================================================
--- branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-05-31 16:08:12 UTC (rev 41583)
+++ branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-05-31 16:47:55 UTC (rev 41584)
@@ -1629,7 +1629,11 @@
* @return the status (never <code>null</code>)
*/
public static ValidationStatus validateValueConstraint( final String constraint ) {
- Utils.verifyIsNotEmpty(constraint, "constraint"); //$NON-NLS-1$
+ try {
+ Utils.verifyIsNotEmpty(constraint, "constraint"); //$NON-NLS-1$
+ } catch (IllegalArgumentException e) {
+ return ValidationStatus.createErrorMessage(StatusCodes.EMPTY_VALUE_CONSTRAINT, Messages.emptyValueConstraint);
+ }
// TODO implement validateValueConstraint to make sure constraint is property syntax
return ValidationStatus.OK_STATUS;
@@ -1789,6 +1793,7 @@
int EMPTY_VALUE_CONSTRAINTS = 285;
int DUPLICATE_VALUE_CONSTRAINT = 290;
int VALUE_CONSTRAINTS_EXIST_BUT_MARKED_AS_VARIANT = 295;
+ int EMPTY_VALUE_CONSTRAINT = 300;
}
}
Modified: branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties
===================================================================
--- branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties 2012-05-31 16:08:12 UTC (rev 41583)
+++ branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties 2012-05-31 16:47:55 UTC (rev 41584)
@@ -57,6 +57,7 @@
emptyUnqualifiedName = The {0} has an empty unqualified name.
# 0 = property or attribute name of a node type definition, property definition, or child node definition
emptyValue = A "{0}" value cannot be empty
+emptyValueConstraint = The value constraint cannot be empty.
# 0 = property definition name
emptyValueConstraints = The property definition "{0}" must have at least one value constraint.
# 0 = property value, 1 = property type, 2 = property name
Modified: branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
===================================================================
--- branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 16:08:12 UTC (rev 41583)
+++ branches/jbosstools-3.3.x/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 16:47:55 UTC (rev 41584)
@@ -57,6 +57,7 @@
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.jboss.tools.modeshape.jcr.ItemOwnerProvider;
import org.jboss.tools.modeshape.jcr.Messages;
+import org.jboss.tools.modeshape.jcr.MultiValidationStatus;
import org.jboss.tools.modeshape.jcr.PropertyDefinition;
import org.jboss.tools.modeshape.jcr.PropertyDefinition.PropertyName;
import org.jboss.tools.modeshape.jcr.QualifiedName;
@@ -1134,8 +1135,12 @@
// check for duplicate
currentDefaultValues.add(newValue);
- return CndValidator.validateDefaultValues(propDefn.getName(), propDefn.getType(), currentDefaultValues,
- accessExistingNamespacePrefixes());
+ MultiValidationStatus validationStatus = CndValidator.validateDefaultValues(propDefn.getName(),
+ propDefn.getType(),
+ currentDefaultValues,
+ accessExistingNamespacePrefixes());
+ currentDefaultValues.remove(newValue);
+ return validationStatus;
}
};
@@ -1158,7 +1163,7 @@
void handleAddValueConstraint() {
final PropertyDefinition propDefn = getPropertyDefinition();
- final Collection<String> currentConstraints = Arrays.asList(propDefn.getValueConstraints());
+ final Collection<String> currentConstraints = new ArrayList<String>(Arrays.asList(propDefn.getValueConstraints()));
final StringValueEditorDialog dialog = new StringValueEditorDialog(getShell()) {
/**
@@ -1191,7 +1196,10 @@
// check for duplicate
currentConstraints.add(newValue);
- return CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(),
+ currentConstraints);
+ currentConstraints.remove(newValue);
+ return validationStatus;
}
};
@@ -1301,8 +1309,12 @@
// check for duplicate
currentDefaultValues.add(newValue);
- return CndValidator.validateDefaultValues(propDefn.getName(), propDefn.getType(), currentDefaultValues,
- accessExistingNamespacePrefixes());
+ MultiValidationStatus validationStatus = CndValidator.validateDefaultValues(propDefn.getName(),
+ propDefn.getType(),
+ currentDefaultValues,
+ accessExistingNamespacePrefixes());
+ currentDefaultValues.remove(newValue);
+ return validationStatus;
}
};
@@ -1378,7 +1390,10 @@
// check for duplicate
currentConstraints.add(newValue);
- return CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(),
+ currentConstraints);
+ currentConstraints.remove(newValue);
+ return validationStatus;
}
};
Modified: branches/jbosstools-3.3.x/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java
===================================================================
--- branches/jbosstools-3.3.x/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java 2012-05-31 16:08:12 UTC (rev 41583)
+++ branches/jbosstools-3.3.x/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java 2012-05-31 16:47:55 UTC (rev 41584)
@@ -205,6 +205,16 @@
}
@Test
+ public void emptyValueConstraintShouldBeAnError() {
+ // setup
+ final ValidationStatus status = CndValidator.validateValueConstraint(Utils.EMPTY_STRING);
+
+ // tests
+ assertTrue(status.isError());
+ assertTrue("Code is " + status.getCode(), status.containsCode(StatusCodes.EMPTY_VALUE_CONSTRAINT)); //$NON-NLS-1$
+ }
+
+ @Test
public void invalidQualifiedNameQualifierShouldBeAnError() {
// setup
final QualifiedName qname = new QualifiedName(Constants.QUALIFIER1 + "Changed", Constants.UNQUALIFIED_NAME1); //$NON-NLS-1$
@@ -410,6 +420,16 @@
}
@Test
+ public void nullValueConstraintShouldBeAnError() {
+ // setup
+ final ValidationStatus status = CndValidator.validateValueConstraint(null);
+
+ // tests
+ assertTrue(status.isError());
+ assertTrue("Code is " + status.getCode(), status.containsCode(StatusCodes.EMPTY_VALUE_CONSTRAINT)); //$NON-NLS-1$
+ }
+
+ @Test
public void primaryItemNameWithNonMatchingQualifierShouldBeAnError() {
// setup
nodeTypeDefinition.setName(Constants.QUALIFIED_NAME1.get());
12 years, 7 months
JBoss Tools SVN: r41583 - branches/jbosstools-3.3.x/requirements/jbeap-6.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-31 12:08:12 -0400 (Thu, 31 May 2012)
New Revision: 41583
Modified:
branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties
Log:
https://issues.jboss.org/browse/JBDS-2181 switch from ER8 to CR1
Modified: branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties
===================================================================
--- branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-05-31 16:08:03 UTC (rev 41582)
+++ branches/jbosstools-3.3.x/requirements/jbeap-6/build.properties 2012-05-31 16:08:12 UTC (rev 41583)
@@ -2,8 +2,8 @@
# This property used to override URI outside the build
# It is usefull to make build work on build server vithout VPN access
-jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-ER8/
+jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-CR1/
build.uri=${jbeap60.build.uri}
-build.archive=jboss-eap-6.0.0.ER8.zip
-md5=e9fbc105f90bc9d4374d1d0b45878eac
+build.archive=jboss-eap-6.0.0.CR1.zip
+md5=ca0e20c5523281233888c296689b7172
12 years, 7 months
JBoss Tools SVN: r41582 - trunk/requirements/jbeap-6.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-31 12:08:03 -0400 (Thu, 31 May 2012)
New Revision: 41582
Modified:
trunk/requirements/jbeap-6/build.properties
Log:
https://issues.jboss.org/browse/JBDS-2181 switch from ER8 to CR1
Modified: trunk/requirements/jbeap-6/build.properties
===================================================================
--- trunk/requirements/jbeap-6/build.properties 2012-05-31 15:00:29 UTC (rev 41581)
+++ trunk/requirements/jbeap-6/build.properties 2012-05-31 16:08:03 UTC (rev 41582)
@@ -2,8 +2,8 @@
# This property used to override URI outside the build
# It is usefull to make build work on build server vithout VPN access
-jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-ER8/
+jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-CR1/
build.uri=${jbeap60.build.uri}
-build.archive=jboss-eap-6.0.0.ER8.zip
-md5=e9fbc105f90bc9d4374d1d0b45878eac
+build.archive=jboss-eap-6.0.0.CR1.zip
+md5=ca0e20c5523281233888c296689b7172
12 years, 7 months
JBoss Tools SVN: r41581 - 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-05-31 11:00:29 -0400 (Thu, 31 May 2012)
New Revision: 41581
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
added missing @Override
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-31 14:56:56 UTC (rev 41580)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-31 15:00:29 UTC (rev 41581)
@@ -906,6 +906,7 @@
}
}
+ @Override
protected void setupWizardPageSupport(DataBindingContext dbc) {
ParametrizableWizardPageSupport.create(
IStatus.ERROR | IStatus.INFO | IStatus.CANCEL, this,
12 years, 7 months
JBoss Tools SVN: r41580 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-31 10:56:56 -0400 (Thu, 31 May 2012)
New Revision: 41580
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-05-31 13:55:39 UTC (rev 41579)
+++ trunk/build/parent/pom.xml 2012-05-31 14:56:56 UTC (rev 41580)
@@ -396,10 +396,12 @@
<profile>
<id>jbosstools-nightly-staging-composite</id>
<activation>
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
</property>
+ -->
</activation>
<repositories>
<repository>
@@ -418,10 +420,12 @@
<profile>
<id>jbosstools-nightly-staging-composite-soa-tooling</id>
<activation>
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
</property>
+ -->
</activation>
<repositories>
<repository>
@@ -444,10 +448,12 @@
<profile>
<id>jbosstools-staging-aggregate</id>
<activation>
+ <!-- JBIDE-11663 disable automatic enablement when swtbot.test.skip = false
<property>
<name>swtbot.test.skip</name>
<value>false</value>
</property>
+ -->
</activation>
<repositories>
<repository>
12 years, 7 months
JBoss Tools SVN: r41579 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-31 09:55:39 -0400 (Thu, 31 May 2012)
New Revision: 41579
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-12065
Rename the 'Disconnect' action into 'Remove from view'
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-31 13:49:01 UTC (rev 41578)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-31 13:55:39 UTC (rev 41579)
@@ -33,7 +33,7 @@
SHOW_ENVIRONMENT_ACTION=Environment Variables
-DELETE_CONNECTION_ACTION=Disconnect
+DELETE_CONNECTION_ACTION=Remove from View
USER_NOT_CONNECTED_LABEL=<User is not connected>
LOADING_USER_APPLICATIONS_LABEL=Loading...
12 years, 7 months
JBoss Tools SVN: r41578 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-31 09:49:01 -0400 (Thu, 31 May 2012)
New Revision: 41578
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-12065
Rename the 'Disconnect' action into 'Remove from view'
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-31 13:38:00 UTC (rev 41577)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-31 13:49:01 UTC (rev 41578)
@@ -33,7 +33,7 @@
SHOW_ENVIRONMENT_ACTION=Environment Variables
-DELETE_CONNECTION_ACTION=Disconnect
+DELETE_CONNECTION_ACTION=Remove from View
USER_NOT_CONNECTED_LABEL=<User is not connected>
LOADING_USER_APPLICATIONS_LABEL=Loading...
12 years, 7 months
JBoss Tools SVN: r41577 - in trunk/modeshape: plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-05-31 09:38:00 -0400 (Thu, 31 May 2012)
New Revision: 41577
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties
trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java
Log:
JBIDE-12056 Exception Adding/Editing Property Definition's Value Constraint In CND Editor. Exception caused by trying to add an element to an unmodifiable list. Also fixed an exception thrown by validator when removing all text.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java 2012-05-31 13:29:00 UTC (rev 41576)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/Messages.java 2012-05-31 13:38:00 UTC (rev 41577)
@@ -163,6 +163,11 @@
public static String emptyValue;
/**
+ * A message indicating a property definition's value constraint is empty.
+ */
+ public static String emptyValueConstraint;
+
+ /**
* A message indicating a property definition is missing value constraints. One parameter, the property definition name, is
* required.
*/
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-05-31 13:29:00 UTC (rev 41576)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-05-31 13:38:00 UTC (rev 41577)
@@ -1629,7 +1629,11 @@
* @return the status (never <code>null</code>)
*/
public static ValidationStatus validateValueConstraint( final String constraint ) {
- Utils.verifyIsNotEmpty(constraint, "constraint"); //$NON-NLS-1$
+ try {
+ Utils.verifyIsNotEmpty(constraint, "constraint"); //$NON-NLS-1$
+ } catch (IllegalArgumentException e) {
+ return ValidationStatus.createErrorMessage(StatusCodes.EMPTY_VALUE_CONSTRAINT, Messages.emptyValueConstraint);
+ }
// TODO implement validateValueConstraint to make sure constraint is property syntax
return ValidationStatus.OK_STATUS;
@@ -1789,6 +1793,7 @@
int EMPTY_VALUE_CONSTRAINTS = 285;
int DUPLICATE_VALUE_CONSTRAINT = 290;
int VALUE_CONSTRAINTS_EXIST_BUT_MARKED_AS_VARIANT = 295;
+ int EMPTY_VALUE_CONSTRAINT = 300;
}
}
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties 2012-05-31 13:29:00 UTC (rev 41576)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/messages.properties 2012-05-31 13:38:00 UTC (rev 41577)
@@ -57,6 +57,7 @@
emptyUnqualifiedName = The {0} has an empty unqualified name.
# 0 = property or attribute name of a node type definition, property definition, or child node definition
emptyValue = A "{0}" value cannot be empty
+emptyValueConstraint = The value constraint cannot be empty.
# 0 = property definition name
emptyValueConstraints = The property definition "{0}" must have at least one value constraint.
# 0 = property value, 1 = property type, 2 = property name
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 13:29:00 UTC (rev 41576)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/PropertyDialog.java 2012-05-31 13:38:00 UTC (rev 41577)
@@ -57,6 +57,7 @@
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.jboss.tools.modeshape.jcr.ItemOwnerProvider;
import org.jboss.tools.modeshape.jcr.Messages;
+import org.jboss.tools.modeshape.jcr.MultiValidationStatus;
import org.jboss.tools.modeshape.jcr.PropertyDefinition;
import org.jboss.tools.modeshape.jcr.PropertyDefinition.PropertyName;
import org.jboss.tools.modeshape.jcr.QualifiedName;
@@ -1158,7 +1159,7 @@
void handleAddValueConstraint() {
final PropertyDefinition propDefn = getPropertyDefinition();
- final Collection<String> currentConstraints = Arrays.asList(propDefn.getValueConstraints());
+ final Collection<String> currentConstraints = new ArrayList<String>(Arrays.asList(propDefn.getValueConstraints()));
final StringValueEditorDialog dialog = new StringValueEditorDialog(getShell()) {
/**
@@ -1191,7 +1192,9 @@
// check for duplicate
currentConstraints.add(newValue);
- return CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ MultiValidationStatus validationStatus = CndValidator.validateValueConstraints(propDefn.getName(), currentConstraints);
+ currentConstraints.remove(newValue);
+ return validationStatus;
}
};
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java 2012-05-31 13:29:00 UTC (rev 41576)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/CndValidatorTest.java 2012-05-31 13:38:00 UTC (rev 41577)
@@ -205,6 +205,16 @@
}
@Test
+ public void emptyValueConstraintShouldBeAnError() {
+ // setup
+ final ValidationStatus status = CndValidator.validateValueConstraint(Utils.EMPTY_STRING);
+
+ // tests
+ assertTrue(status.isError());
+ assertTrue("Code is " + status.getCode(), status.containsCode(StatusCodes.EMPTY_VALUE_CONSTRAINT)); //$NON-NLS-1$
+ }
+
+ @Test
public void invalidQualifiedNameQualifierShouldBeAnError() {
// setup
final QualifiedName qname = new QualifiedName(Constants.QUALIFIER1 + "Changed", Constants.UNQUALIFIED_NAME1); //$NON-NLS-1$
@@ -410,6 +420,16 @@
}
@Test
+ public void nullValueConstraintShouldBeAnError() {
+ // setup
+ final ValidationStatus status = CndValidator.validateValueConstraint(null);
+
+ // tests
+ assertTrue(status.isError());
+ assertTrue("Code is " + status.getCode(), status.containsCode(StatusCodes.EMPTY_VALUE_CONSTRAINT)); //$NON-NLS-1$
+ }
+
+ @Test
public void primaryItemNameWithNonMatchingQualifierShouldBeAnError() {
// setup
nodeTypeDefinition.setName(Constants.QUALIFIED_NAME1.get());
12 years, 7 months