October 2011 - jbosstools-commits

JBoss Tools SVN: r35411 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-06 01:28:19 -0400 (Thu, 06 Oct 2011) New Revision: 35411 Modified: trunk/build/target-platform/build.xml Log: switch to using Eclipse R-3.7.1-201109091335 Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2011-10-06 05:22:13 UTC (rev 35410) +++ trunk/build/target-platform/build.xml 2011-10-06 05:28:19 UTC (rev 35411) @@ -145,8 +145,8 @@   - <property name="eclipse.version" value="M20110831-1030" /> - <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/> + <property name="eclipse.version" value="3.7.1" /> + <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/> <if> <equals arg1="${arch}" arg2="x86" />

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35410 - in trunk/download.jboss.org/jbosstools/updates/indigo: extras/SR1 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-10-06 01:22:13 -0400 (Thu, 06 Oct 2011) New Revision: 35410 Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... Log: point SR1 composites at new Indigo SR1 bits (JBDS-1868, JBIDE-9786, JBDS-1872) Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... 2011-10-06 00:43:27 UTC (rev 35409) +++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeArtifacts... 2011-10-06 05:22:13 UTC (rev 35410) @@ -3,22 +3,22 @@ <repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1317176311000'/> +<property name='p2.timestamp' value='1317877554000'/> </properties> -<children size='14'> -<child location='../../requirements/indigo/201105270900-RC2/'/> -<child location='../../requirements/birt/3.7RC2/'/> -<child location='../../requirements/ecf/3.5/'/> -<child location='../../requirements/eclipse/3.7RC5/'/> +<children size='13'> +<child location='../../requirements/indigo/201109230900-SR1/'/> +<child location='../../requirements/birt/3.7.1/'/> +<child location='../../requirements/ecf/3.5.2/'/> +<child location='../../requirements/eclipse/3.7.1/'/> <child location='../../requirements/egit/1.0.0/'/> -<child location='../../requirements/emf/2.7RC3/'/> -<child location='../../requirements/m2eclipse/20110728-1500/'/> -<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/> +<child location='../../requirements/emf/2.7.1/'/> + +<child location='../../requirements/m2eclipse/20111005-1500/'/> <child location='../../requirements/mylyn/3.6.2-v20110908-0706/'/> <child location='../../requirements/orbit/R20110523182458/'/> +<child location='../../requirements/swtbot/2.0.5/'/> -<child location='../../requirements/swtbot/2.0.4/'/> <child location='../../requirements/webtools/3.3.1-20110915193224/'/> <child location='../../requirements/xulrunner-1.9.2/'/> <child location='http://dl.google.com/eclipse/plugin/3.7/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml 2011-10-06 00:43:27 UTC (rev 35409) +++ trunk/download.jboss.org/jbosstools/updates/indigo/SR1/compositeContent.xml 2011-10-06 05:22:13 UTC (rev 35410) @@ -3,22 +3,22 @@ <repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1317176307000'/> +<property name='p2.timestamp' value='1317877554000'/> </properties> -<children size='14'> -<child location='../../requirements/indigo/201105270900-RC2/'/> -<child location='../../requirements/birt/3.7RC2/'/> -<child location='../../requirements/ecf/3.5/'/> -<child location='../../requirements/eclipse/3.7RC5/'/> +<children size='13'> +<child location='../../requirements/indigo/201109230900-SR1/'/> +<child location='../../requirements/birt/3.7.1/'/> +<child location='../../requirements/ecf/3.5.2/'/> +<child location='../../requirements/eclipse/3.7.1/'/> <child location='../../requirements/egit/1.0.0/'/> -<child location='../../requirements/emf/2.7RC3/'/> -<child location='../../requirements/m2eclipse/20110728-1500/'/> -<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/> +<child location='../../requirements/emf/2.7.1/'/> + +<child location='../../requirements/m2eclipse/20111005-1500/'/> <child location='../../requirements/mylyn/3.6.2-v20110908-0706/'/> <child location='../../requirements/orbit/R20110523182458/'/> +<child location='../../requirements/swtbot/2.0.5/'/> -<child location='../../requirements/swtbot/2.0.4/'/> <child location='../../requirements/webtools/3.3.1-20110915193224/'/> <child location='../../requirements/xulrunner-1.9.2/'/> <child location='http://dl.google.com/eclipse/plugin/3.7/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... 2011-10-06 00:43:27 UTC (rev 35409) +++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... 2011-10-06 05:22:13 UTC (rev 35410) @@ -3,16 +3,15 @@ <repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1317176212000'/> +<property name='p2.timestamp' value='1317877601000'/> </properties> -<children size='9'> +<children size='8'> <child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/> <child location='../../../requirements/findbugs/1.3.9/'/> <child location='../../../requirements/jslint/1.5/'/> -<child location="../../../requirements/m2eclipse/20110728-1500/"/> <child location='../../../requirements/pmd/3.2.4/'/> - <child location='../../../requirements/springide/2.6.0.201103160035/'/> + <child location='../../../requirements/subclipse/1.6_1.3/'/> <child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/> <child location='../../../requirements/testng/6.1.1.20110823_1537/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... 2011-10-06 00:43:27 UTC (rev 35409) +++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... 2011-10-06 05:22:13 UTC (rev 35410) @@ -3,16 +3,15 @@ <repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1317176232000'/> +<property name='p2.timestamp' value='1317877601000'/> </properties> -<children size='9'> +<children size='8'> <child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/> <child location='../../../requirements/findbugs/1.3.9/'/> <child location='../../../requirements/jslint/1.5/'/> -<child location="../../../requirements/m2eclipse/20110728-1500/"/> <child location='../../../requirements/pmd/3.2.4/'/> - <child location='../../../requirements/springide/2.6.0.201103160035/'/> + <child location='../../../requirements/subclipse/1.6_1.3/'/> <child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/> <child location='../../../requirements/testng/6.1.1.20110823_1537/'/>

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35409 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-10-05 20:43:27 -0400 (Wed, 05 Oct 2011) New Revision: 35409 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java Log: https://issues.jboss.org/browse/JBIDE-9846 Fixed infinite loop in XHTM validator Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2011-10-06 00:06:18 UTC (rev 35408) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2011-10-06 00:43:27 UTC (rev 35409) @@ -353,19 +353,11 @@ } return qName.toString(); } - - @Override - public void error(SAXParseException e) throws SAXException { - } - @Override - public void fatalError(SAXParseException e) throws SAXException { - } - List<ElementLocation> getNonPairedOpenElements() { return nonPairedOpenElements; } - + List<ElementLocation> getNonPairedCloseElements() { return nonPairedCloseElements; } @@ -373,7 +365,7 @@ private int getCurrentLocation() { if (locator == null) return 0; - + int line = locator.getLineNumber() - 1; int lineOffset = locator.getColumnNumber() - 1; try {

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35408 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-10-05 20:06:18 -0400 (Wed, 05 Oct 2011) New Revision: 35408 Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java Log: [JBIDE-9793] added link to application url (public url), tried to fix combo selection in "NewApplicationWizardPage" (is still not working: no initial selection, no validation) Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-05 23:54:27 UTC (rev 35407) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-06 00:06:18 UTC (rev 35408) @@ -114,7 +114,7 @@ Label label = new Label(container, SWT.None); label.setText(name); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(label); - Text text = new Text(container, SWT.BORDER); + Text text = new Text(container, SWT.NONE); text.setEditable(false); text.setBackground(container.getBackground()); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(text); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-05 23:54:27 UTC (rev 35407) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-06 00:06:18 UTC (rev 35408) @@ -96,7 +96,8 @@ @Override public Object convert(Object fromObject) { - if (fromObject instanceof String) { + if (fromObject instanceof String + && ((String) fromObject).length() > 0) { return new Cartridge(((String) fromObject)); } return null;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35407 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-10-05 19:54:27 -0400 (Wed, 05 Oct 2011) New Revision: 35407 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java Log: Quick fixes for problem markers in beans.xml https://issues.jboss.org/browse/JBIDE-9833 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-10-05 23:51:50 UTC (rev 35406) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-10-05 23:54:27 UTC (rev 35407) @@ -184,7 +184,7 @@ List<TypeNode> typeNodes = getTypeElements((Element)parentNode, typeValidator.getTypeElementName()); Map<String, TypeNode> uniqueTypes = new HashMap<String, TypeNode>(); for (TypeNode typeNode : typeNodes) { - IType type = getType(beansXml, typeNode, typeValidator.getUnknownTypeErrorMessage()); + IType type = getType(beansXml, typeNode, typeValidator.getUnknownTypeErrorMessage(), typeValidator.getUnknownTypeErrorMessageId()); if(type!=null) { if(!type.isBinary()) { validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, beansXml.getFullPath().toOSString(), type.getPath(), false); @@ -199,17 +199,17 @@ } if(!typeValidator.validateKindOfType(type)) { validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, - new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId()); } else if(type.isBinary()) { if(!typeValidator.validateBinaryType(type)) { validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, - new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId()); } continue; } else { if(!typeValidator.validateSourceType(type)) { validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, - new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml, typeValidator.getIllegalTypeErrorMessageId()); } } TypeNode node = uniqueTypes.get(typeNode.getTypeName()); @@ -252,7 +252,7 @@ return null; } - private IType getType(IFile beansXml, TypeNode node, String errorMessage) { + private IType getType(IFile beansXml, TypeNode node, String errorMessage, int errorMessageId) { IType type = null; if(node.getTypeName()!=null) { try { @@ -268,7 +268,7 @@ if(type==null) { addLinkedResourcesForUnknownType(beansXml, node.getTypeName()); validator.addError(errorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, - new String[]{}, node.getLength(), node.getStartOffset(), beansXml); + new String[]{}, node.getLength(), node.getStartOffset(), beansXml, errorMessageId); } return type; } @@ -389,8 +389,12 @@ String getParrentElementname(); String getUnknownTypeErrorMessage(); + + int getUnknownTypeErrorMessageId(); String getIllegalTypeErrorMessage(); + + int getIllegalTypeErrorMessageId(); String getDuplicateTypeErrorMessage(); } @@ -432,11 +436,19 @@ public String getUnknownTypeErrorMessage() { return CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME; } + + public int getUnknownTypeErrorMessageId() { + return CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID; + } public String getIllegalTypeErrorMessage() { return CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS; } + public int getIllegalTypeErrorMessageId() { + return CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID; + } + public String getDuplicateTypeErrorMessage() { return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE; } @@ -472,10 +484,18 @@ return CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME; } + public int getUnknownTypeErrorMessageId() { + return CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID; + } + public String getIllegalTypeErrorMessage() { return CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION; } + public int getIllegalTypeErrorMessageId() { + return CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_ANNOTATION_ID; + } + public String getDuplicateTypeErrorMessage() { return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE; } @@ -500,11 +520,19 @@ public String getUnknownTypeErrorMessage() { return CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME; } + + public int getUnknownTypeErrorMessageId() { + return CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID; + } public String getIllegalTypeErrorMessage() { return CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS; } + public int getIllegalTypeErrorMessageId() { + return CDIValidationErrorManager.ILLEGAL_DECORATOR_BEAN_CLASS_ID; + } + public String getDuplicateTypeErrorMessage() { return CDIValidationMessages.DUPLICATE_DECORATOR_CLASS; } @@ -529,11 +557,19 @@ public String getUnknownTypeErrorMessage() { return CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME; } + + public int getUnknownTypeErrorMessageId() { + return CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID; + } public String getIllegalTypeErrorMessage() { return CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS; } + public int getIllegalTypeErrorMessageId() { + return CDIValidationErrorManager.ILLEGAL_INTERCEPTOR_CLASS_ID; + } + public String getDuplicateTypeErrorMessage() { return CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-10-05 23:51:50 UTC (rev 35406) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-10-05 23:54:27 UTC (rev 35407) @@ -61,6 +61,14 @@ public static final int OBSERVER_IN_INTERCEPTOR_ID = 40; public static final int SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID = 41; public static final int SESSION_BEAN_ANNOTATED_DECORATOR_ID = 42; + public static final int UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID = 43; + public static final int UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID = 44; + public static final int ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID = 45; + public static final int ILLEGAL_ALTERNATIVE_ANNOTATION_ID = 46; + public static final int UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID = 47; + public static final int UNKNOWN_INTERCEPTOR_CLASS_NAME_ID = 48; + public static final int ILLEGAL_DECORATOR_BEAN_CLASS_ID = 49; + public static final int ILLEGAL_INTERCEPTOR_CLASS_ID = 50; /*

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35406 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-10-05 19:51:50 -0400 (Wed, 05 Oct 2011) New Revision: 35406 Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java Log: [JBIDE-9793] added link to application url (public url), tried to fix combo selection in "NewApplicationWizardPage" (is still not working: no initial selection, no validation) Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenshiftWizardPage.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -22,7 +22,6 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; import org.jboss.tools.openshift.express.internal.ui.OpenshiftImages; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -12,19 +12,25 @@ import java.util.concurrent.Callable; +import org.eclipse.core.runtime.ILog; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.common.ui.BrowserUtil; import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; import org.jboss.tools.openshift.express.internal.ui.OpenshiftImages; +import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; /** * @author André Dietisheim @@ -74,28 +80,47 @@ return application.getGitUri(); } }.get(), container); - createDetails("Public URL", new ErrorMessageCallable<String>("Public URL") { + Label publicUrlLabel = new Label(container, SWT.NONE); + publicUrlLabel.setText("Public URL"); + GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(publicUrlLabel); + Link publicUrlLink = new Link(container, SWT.WRAP); + String applicationUrl = new ErrorMessageCallable<String>("Public URL") { + @Override public String call() throws Exception { return application.getApplicationUrl(); } - }.get(), container); + }.get(); + publicUrlLink.setText("<a>" + applicationUrl + "</a>"); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(publicUrlLink); + publicUrlLink.addSelectionListener(onPublicUrl(applicationUrl)); return container; } + private SelectionAdapter onPublicUrl(final String applicationUrl) { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + ILog log = OpenshiftUIActivator.getDefault().getLog(); + BrowserUtil.checkedCreateExternalBrowser(applicationUrl, OpenshiftUIActivator.PLUGIN_ID, log); + } + }; + } + private void createDetails(String name, String value, Composite container) { Label label = new Label(container, SWT.None); label.setText(name); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(label); Text text = new Text(container, SWT.BORDER); text.setEditable(false); + text.setBackground(container.getBackground()); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(text); text.setText(value); } - private abstract class ErrorMessageCallable<T> implements Callable<T> { private String fieldName; Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -32,9 +32,6 @@ import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.jface.viewers.ViewerCell; @@ -51,7 +48,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.ui.PlatformUI; -import org.jboss.tools.common.ui.BrowserUtil; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.common.ui.databinding.DataBindingUtils; import org.jboss.tools.openshift.express.client.IApplication; @@ -129,21 +125,22 @@ @Override public void doubleClick(DoubleClickEvent event) { - try { - ISelection selection = event.getSelection(); - if (selection instanceof StructuredSelection) { - Object firstElement = ((IStructuredSelection) selection).getFirstElement(); - if (firstElement instanceof IApplication) { - String url = ((IApplication) firstElement).getApplicationUrl(); - BrowserUtil.checkedCreateExternalBrowser(url, OpenshiftUIActivator.PLUGIN_ID, - OpenshiftUIActivator.getDefault().getLog()); - } - } - } catch (OpenshiftException e) { - IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, - "Could not open Openshift Express application in browser", e); - OpenshiftUIActivator.getDefault().getLog().log(status); - } +// try { +// ISelection selection = event.getSelection(); +// if (selection instanceof StructuredSelection) { +// Object firstElement = ((IStructuredSelection) selection).getFirstElement(); +// if (firstElement instanceof IApplication) { +// String url = ((IApplication) firstElement).getApplicationUrl(); +// BrowserUtil.checkedCreateExternalBrowser(url, OpenshiftUIActivator.PLUGIN_ID, +// OpenshiftUIActivator.getDefault().getLog()); +// } +// } +// } catch (OpenshiftException e) { +// IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, +// "Could not open Openshift Express application in browser", e); +// OpenshiftUIActivator.getDefault().getLog().log(status); +// } + openDetailsDialog(); } }; } @@ -231,12 +228,16 @@ @Override public void widgetSelected(SelectionEvent e) { - Shell shell = getContainer().getShell(); - new ApplicationDetailsDialog(model.getSelectedApplication(), shell).open(); + openDetailsDialog(); } }; } + private void openDetailsDialog() { + Shell shell = getContainer().getShell(); + new ApplicationDetailsDialog(model.getSelectedApplication(), shell).open(); + } + @Override protected void onPageActivated(DataBindingContext dbc) { try { Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -39,7 +39,7 @@ public boolean performFinish() { final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); try { - WizardUtils.runInWizard(new Job("Creating application") { + WizardUtils.runInWizard(new Job("Creating application...") { @Override protected IStatus run(IProgressMonitor monitor) { Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.client.Cartridge; import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.OpenshiftException; import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator; @@ -62,16 +63,17 @@ nameText.setTextLimit(13); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(nameText); Binding nameBinding = dbc.bindValue( - WidgetProperties.text(SWT.Modify).observe(nameText) + WidgetProperties.text(SWT.Modify).observe(nameText) , BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_NAME).observe(model) , new UpdateValueStrategy().setAfterGetValidator(new ApplicationNameValidator()) , null); ControlDecorationSupport.create(nameBinding, SWT.LEFT | SWT.TOP); - + Label cartridgeLabel = new Label(parent, SWT.WRAP); cartridgeLabel.setText("&Cartridge"); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(cartridgeLabel); - Combo cartridgesCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); + Combo cartridgesCombo = new Combo(parent, SWT.BORDER | + SWT.READ_ONLY); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cartridgesCombo); dbc.bindList( WidgetProperties.items().observe(cartridgesCombo) @@ -87,20 +89,52 @@ return ((ICartridge) fromObject).getName(); } })); - dbc.bindValue( + Binding comboSelectionBinding = dbc.bindValue( WidgetProperties.selection().observe(cartridgesCombo) - , BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(model)); + , BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(model) + , new UpdateValueStrategy().setConverter(new Converter(String.class, ICartridge.class) { + + @Override + public Object convert(Object fromObject) { + if (fromObject instanceof String) { + return new Cartridge(((String) fromObject)); + } + return null; + } + }) + , new UpdateValueStrategy().setAfterGetValidator( + new IValidator() { + + @Override + public IStatus validate(Object value) { + if (!(value instanceof ICartridge)) { + return ValidationStatus.error("You have to select a type"); + } else { + return ValidationStatus.ok(); + } + } + }).setConverter(new Converter(ICartridge.class, String.class) { + + @Override + public Object convert(Object fromObject) { + if (fromObject instanceof ICartridge) { + return ((ICartridge) fromObject).getName(); + } + return null; + } + })); + ControlDecorationSupport.create(comboSelectionBinding, SWT.LEFT | SWT.TOP); } @Override protected void onPageActivated(DataBindingContext dbc) { try { - WizardUtils.runInWizard(new Job("Loading cartridges") { + WizardUtils.runInWizard(new Job("Loading cartridges...") { @Override protected IStatus run(IProgressMonitor monitor) { try { - + model.loadCartridges(); } catch (OpenshiftException e) { return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Could not load cartridges", e); Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-05 23:40:51 UTC (rev 35405) +++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-05 23:51:50 UTC (rev 35406) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.util.ArrayList; import java.util.Collection; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; @@ -30,25 +31,26 @@ private IUser user; private String name; - - private Collection<ICartridge> cartridges; - private String selectedCartridge; + + private Collection<ICartridge> cartridges = new ArrayList<ICartridge>(); + private ICartridge selectedCartridge; private StringPreferenceValue selectedCartridgePreference; public NewApplicationWizardPageModel(IUser user) { this.user = user; this.selectedCartridgePreference = new StringPreferenceValue( - "org.jboss.tools.openshift.express.internal.ui.wizard.NewApplicationWizard.selectedCartridge", OpenshiftUIActivator.PLUGIN_ID); + "org.jboss.tools.openshift.express.internal.ui.wizard.NewApplicationWizard.selectedCartridge", + OpenshiftUIActivator.PLUGIN_ID); initSelectedCartridge(); } private void initSelectedCartridge() { - String selectedCartridge = selectedCartridgePreference.get(); - if (selectedCartridge == null - || selectedCartridge.length() == 0) { - selectedCartridge = ICartridge.JBOSSAS_7.getName(); + String selectedCartridgeName = selectedCartridgePreference.get(); + if (selectedCartridgeName == null + || selectedCartridgeName.length() == 0) { + selectedCartridge = ICartridge.JBOSSAS_7; } - this.selectedCartridge = selectedCartridge; + this.selectedCartridge = getCartridgeByName(selectedCartridgeName); } public String getName() { @@ -71,17 +73,28 @@ return cartridges; } - public String getSelectedCartridge() { + public ICartridge getSelectedCartridge() { return selectedCartridge; } - public void setSelectedCartridge(String name) { - selectedCartridgePreference.store(name); - firePropertyChange(PROPERTY_SELECTED_CARTRIDGE, selectedCartridge, this.selectedCartridge = name); + public void setSelectedCartridge(ICartridge cartridge) { + selectedCartridgePreference.store(cartridge.getName()); + firePropertyChange(PROPERTY_SELECTED_CARTRIDGE, selectedCartridge, this.selectedCartridge = cartridge); } + private ICartridge getCartridgeByName(String name) { + ICartridge matchingCartridge = null; + for (ICartridge cartridge : getCartridges()) { + if (name.equals(cartridge.getName())) { + matchingCartridge = cartridge; + break; + } + } + return matchingCartridge; + } + public void createApplication() throws OpenshiftException { - user.createApplication(name, user.getCartridgeByName(selectedCartridge)); + user.createApplication(name, selectedCartridge); } public boolean hasApplication(String name) {

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35405 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-10-05 19:40:51 -0400 (Wed, 05 Oct 2011) New Revision: 35405 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java Log: Boolean.TRUE.booleanValue() -> true Boolean.FALSE.booleanValue() -> false Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java 2011-10-05 23:32:54 UTC (rev 35404) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/NewTypeWizardAdapter.java 2011-10-05 23:40:51 UTC (rev 35405) @@ -37,11 +37,11 @@ // common data private IJavaProject javaProject; private IProject project; - private boolean rawData = Boolean.TRUE.booleanValue(); - private boolean createMain = Boolean.TRUE.booleanValue(); - private boolean createConstructors = Boolean.TRUE.booleanValue(); - private boolean createInherited = Boolean.TRUE.booleanValue(); - private boolean canBeModified = Boolean.TRUE.booleanValue(); + private boolean rawData = true; + private boolean createMain = true; + private boolean createConstructors = true; + private boolean createInherited = true; + private boolean canBeModified = true; private IStatus classNameStatus; private IStatus packageNameStatus; @@ -76,22 +76,22 @@ } public void setRawClassName(String rawClassName) { - this.rawData = Boolean.TRUE.booleanValue(); + this.rawData = true; this.className = rawClassName; } public void setRawSuperClassName(String rawSuperClassName) { - this.rawData = Boolean.TRUE.booleanValue(); + this.rawData = true; this.superClassName = rawSuperClassName; } public void setRawPackageName(String rawPackageName) { - this.rawData = Boolean.TRUE.booleanValue(); + this.rawData = true; this.packageName = rawPackageName; } public void addRawInterfaceName(String rawInterfaceName) { - this.rawData = Boolean.TRUE.booleanValue(); + this.rawData = true; this.rawInterfaces.add(rawInterfaceName); } @@ -176,7 +176,7 @@ // check super class } - rawData = Boolean.FALSE.booleanValue(); + rawData = false; } catch (JavaModelException e) { ModelUIPlugin.getPluginLog().logError(e); } @@ -220,7 +220,7 @@ public boolean getEnclosingTypeSelection() { if (rawData) doAdapted(); - return Boolean.FALSE.booleanValue(); + return false; } public String getTypeName() {

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35404 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-10-05 19:32:54 -0400 (Wed, 05 Oct 2011) New Revision: 35404 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java Log: https://issues.jboss.org/browse/JBIDE-9846 Fixed infinite loop in XHTM validator Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2011-10-05 22:38:57 UTC (rev 35403) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2011-10-05 23:32:54 UTC (rev 35404) @@ -71,11 +71,9 @@ "http://apache.org/xml/features/nonvalidating/load-external-dtd", "http://apache.org/xml/features/nonvalidating/load-dtd-grammar", "http://apache.org/xml/features/xinclude", - "http://xml.org/sax/features/resolve-dtd-uris" - }; - private String[] SAX_PARSER_FEATURES_TO_ENABLE = { + "http://xml.org/sax/features/resolve-dtd-uris", "http://apache.org/xml/features/continue-after-fatal-error" - }; + }; private void setSAXParserFeatures(XMLReader reader, String[] features, boolean set) { for (String feature : features) { @@ -139,22 +137,19 @@ report); XMLReader xmlReader = new org.apache.xerces.parsers.SAXParser(); - try { - setSAXParserFeatures(xmlReader, SAX_PARSER_FEATURES_TO_DISABLE, false); - setSAXParserFeatures(xmlReader, SAX_PARSER_FEATURES_TO_ENABLE, true); - setSAXParserProperty(xmlReader, "http://xml.org/sax/properties/lexical-handler", handler); - xmlReader.setContentHandler(handler); - xmlReader.setDTDHandler(handler); - xmlReader.setErrorHandler(handler); + setSAXParserFeatures(xmlReader, SAX_PARSER_FEATURES_TO_DISABLE, false); + setSAXParserProperty(xmlReader, "http://xml.org/sax/properties/lexical-handler", handler); + xmlReader.setContentHandler(handler); + xmlReader.setDTDHandler(handler); + xmlReader.setErrorHandler(handler); + isXHTMLDoctype = false; - isXHTMLDoctype = false; - + try { xmlReader.parse(uri); } catch (IOException e) { JSFModelPlugin.getDefault().logError(e); report.addError(e.getLocalizedMessage(), 0, 0, uri); } catch (SAXException e) { - JSFModelPlugin.getDefault().logError(e); report.addError(e.getLocalizedMessage(), 0, 0, uri); }

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35403 - trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-10-05 18:38:57 -0400 (Wed, 05 Oct 2011) New Revision: 35403 Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java Log: [JBIDE-9793] corrected IUser#getCartridges (was: collection, now: list) Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java =================================================================== --- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java 2011-10-05 22:17:13 UTC (rev 35402) +++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/IUser.java 2011-10-05 22:38:57 UTC (rev 35403) @@ -11,6 +11,7 @@ package org.jboss.tools.openshift.express.client; import java.util.Collection; +import java.util.List; /** * @author André Dietisheim @@ -42,7 +43,7 @@ public ISSHPublicKey getSshKey() throws OpenshiftException; - public Collection<ICartridge> getCartridges() throws OpenshiftException; + public List<ICartridge> getCartridges() throws OpenshiftException; public ICartridge getCartridgeByName(String name) throws OpenshiftException;

13 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r35402 - in trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath: handlers and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-10-05 18:17:13 -0400 (Wed, 05 Oct 2011) New Revision: 35402 Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java Log: JBIDE-8972 : check if destination folder is valid Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2011-10-05 21:58:25 UTC (rev 35401) +++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2011-10-05 22:17:13 UTC (rev 35402) @@ -246,6 +246,14 @@ selectedClasspathEntryPaths.put(entry.getKey().getPath(),entry.getValue()); } + String ancestorPath = libFolder.getFullPath().segment(0); + IResource ancestor = ResourcesPlugin.getWorkspace().getRoot().findMember(ancestorPath); + if (ancestor == null || !ancestor.exists()) { + setErrorMessage(ancestorPath + " does not exist "); + return; + } + + Set<String> duplicates = findDuplicates(selectedClasspathEntryPaths.values()); if (!duplicates.isEmpty()) { setErrorMessage("Duplicate entries found : "+duplicates.toString()); Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2011-10-05 21:58:25 UTC (rev 35401) +++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2011-10-05 22:17:13 UTC (rev 35402) @@ -109,6 +109,8 @@ Display.getDefault().asyncExec(new Runnable() { public void run() { Shell shell = HandlerUtil.getActiveShell(event); + Throwable e = result.getException(); + if (e != null) e.printStackTrace(); MessageDialogWithToggle.openError(shell, NLS.bind("Error Materializing {0}", libName), result.getMessage()); } });

13 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2011