JBoss Tools SVN: r10693 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-06 11:17:55 -0400 (Mon, 06 Oct 2008)
New Revision: 10693
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2858 fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-10-06 15:12:06 UTC (rev 10692)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-10-06 15:17:55 UTC (rev 10693)
@@ -34,6 +34,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
@@ -306,16 +307,17 @@
private List<Node> findStyleLinks (NodeList list) {
List<Node> styleLinks = new ArrayList<Node>();
for (int i = 0; list != null && i < list.getLength(); i++) {
- IDOMElement element = (IDOMElement)list.item(i);
+
+ IDOMNode element = (IDOMNode)list.item(i);
String axis = JSPRootHyperlinkPartitioner.computeAxis(getDocument(), element.getStartOffset());
axis = axis.toLowerCase();
if (axis.endsWith("/link")) {
- Attr relAttr = element.getAttributeNode("rel");
+ Node relAttr = element.getAttributes().getNamedItem("rel");
if (relAttr != null) {
String val = relAttr.getNodeValue().toLowerCase();
if ("stylesheet".equalsIgnoreCase(val) || "\"stylesheet\"".equalsIgnoreCase(val)) {
- Attr hrefAttr = element.getAttributeNode("href");
+ Node hrefAttr = element.getAttributes().getNamedItem("href");
if (hrefAttr != null) {
styleLinks.add(hrefAttr);
}
16 years, 3 months
JBoss Tools SVN: r10692 - in trunk/as/docs/reference/en/images: perspective and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-06 11:12:06 -0400 (Mon, 06 Oct 2008)
New Revision: 10692
Modified:
trunk/as/docs/reference/en/images/modules/modules_4.png
trunk/as/docs/reference/en/images/perspective/perspective_1.png
trunk/as/docs/reference/en/images/perspective/perspective_17.png
trunk/as/docs/reference/en/images/perspective/perspective_18.png
trunk/as/docs/reference/en/images/perspective/perspective_2.png
trunk/as/docs/reference/en/images/perspective/perspective_21.png
trunk/as/docs/reference/en/images/perspective/perspective_3.png
trunk/as/docs/reference/en/images/perspective/perspective_4.png
trunk/as/docs/reference/en/images/perspective/perspective_5.png
trunk/as/docs/reference/en/images/perspective/perspective_6.png
trunk/as/docs/reference/en/images/perspective/perspective_7.png
trunk/as/docs/reference/en/images/perspective/perspective_8.png
trunk/as/docs/reference/en/images/perspective/perspective_9.png
trunk/as/docs/reference/en/images/quick_start/quick_start_2.png
trunk/as/docs/reference/en/images/quick_start/quick_start_5.png
trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png
trunk/as/docs/reference/en/images/tptp_support/tptp_support_1.png
Log:
https://jira.jboss.org/jira/browse/JBDS-431 - updating screens;
Modified: trunk/as/docs/reference/en/images/modules/modules_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_17.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_18.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_2.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_21.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_3.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_5.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_6.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_7.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_8.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_9.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/quick_start/quick_start_2.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/quick_start/quick_start_5.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/tptp_support/tptp_support_1.png
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Tools SVN: r10691 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-06 11:06:28 -0400 (Mon, 06 Oct 2008)
New Revision: 10691
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2731
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-06 15:03:27 UTC (rev 10690)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-06 15:06:28 UTC (rev 10691)
@@ -47,6 +47,7 @@
import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
+import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -357,10 +358,8 @@
new ProjectNamesDuplicationValidator(
IFacetDataModelProperties.FACET_PROJECT_NAME));
validatorDelegate.addValidatorForProperty(
- ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- new DeploymentTypeValidator(
- ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- ((NewProjectDataModelFacetWizard)getWizard()).getDataModel()));
+ ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
+ getDeploymentTypeValidator(getWizard()));
}
jBossHibernateDbTypeEditor
@@ -540,6 +539,20 @@
}
}
+ IValidator getDeploymentTypeValidator(IWizard wizard) {
+ if(wizard instanceof NewProjectDataModelFacetWizard) {
+ return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ((NewProjectDataModelFacetWizard)wizard).getDataModel());
+ } else if(wizard instanceof ModifyFacetedProjectWizard) {
+ ModifyFacetedProjectWizard mfpw = (ModifyFacetedProjectWizard)wizard;
+ }
+ return new IValidator() {
+ public Map<String, String> validate(Object value, Object context) {
+ SeamInstallWizardPage.this.validate();
+ return ValidatorFactory.NO_ERRORS;
+ }
+ };
+ }
+
static class DeploymentTypeValidator implements IValidator {
String propertyName;
@@ -556,7 +569,7 @@
/**
*/
- public DeploymentTypeValidator (String propertyName, IDataModel model) {
+ public DeploymentTypeValidator(String propertyName, IDataModel model) {
this.propertyName = propertyName;
this.model = model;
}
@@ -565,7 +578,6 @@
* @see IValidator#validate(Object, Object)
*/
public Map<String, String> validate(Object value, Object context) {
-
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
16 years, 3 months
JBoss Tools SVN: r10690 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-06 11:03:27 -0400 (Mon, 06 Oct 2008)
New Revision: 10690
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2731
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-10-06 14:58:09 UTC (rev 10689)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-10-06 15:03:27 UTC (rev 10690)
@@ -78,10 +78,34 @@
public static String DROOLS_LIB_SEAM_RELATED_PATH = "lib"; //$NON-NLS-1$
- public void doExecute(final IProject project, IProjectFacetVersion fv,
- Object config, IProgressMonitor monitor) throws CoreException {
- final IDataModel model = (IDataModel)config;
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForEar(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForEar(final IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException {
+ // TODO
+ }
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForEjb(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForEjb(final IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException {
+ // TODO
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForWar(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForWar(final IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException {
+
// get WebContents folder path from DWP model
IVirtualComponent component = ComponentCore.createComponent(project);
IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-10-06 14:58:09 UTC (rev 10689)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-10-06 15:03:27 UTC (rev 10690)
@@ -35,6 +35,7 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.javaee.core.DisplayName;
import org.eclipse.jst.javaee.core.JavaeeFactory;
import org.eclipse.jst.javaee.core.Listener;
@@ -55,7 +56,9 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.seam.core.SeamCoreMessages;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.osgi.service.prefs.BackingStoreException;
@@ -239,14 +242,59 @@
*
* @param project
* @param fv
+ * @param model
+ * @param monitor
+ * @throws CoreException
+ */
+ protected abstract void doExecuteForWar(IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException;
+
+ /**
+ *
+ * @param project
+ * @param fv
+ * @param model
+ * @param monitor
+ * @throws CoreException
+ */
+ protected abstract void doExecuteForEar(IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException;
+
+ /**
+ *
+ * @param project
+ * @param fv
+ * @param model
+ * @param monitor
+ * @throws CoreException
+ */
+ protected abstract void doExecuteForEjb(IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException;
+
+ /**
+ *
+ * @param project
+ * @param fv
* @param config
* @param monitor
* @throws CoreException
*/
- protected abstract void doExecute(IProject project, IProjectFacetVersion fv,
- Object config, IProgressMonitor monitor) throws CoreException;
+ public void doExecute(final IProject project, IProjectFacetVersion fv,
+ Object config, IProgressMonitor monitor) throws CoreException {
+ final IDataModel model = (IDataModel)config;
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ IProjectFacetVersion ejbVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.EJB_FACET);
+ IProjectFacetVersion webVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
+ IProjectFacetVersion earVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.ENTERPRISE_APPLICATION_FACET);
+ if(ejbVersion!=null) {
+ doExecuteForEjb(project, fv, model, monitor);
+ } else if(webVersion!=null) {
+ doExecuteForWar(project, fv, model, monitor);
+ } else if(earVersion!=null) {
+ doExecuteForEar(project, fv, model, monitor);
+ }
+ }
-
/**
*
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-10-06 14:58:09 UTC (rev 10689)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-10-06 15:03:27 UTC (rev 10690)
@@ -22,6 +22,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.javaee.core.DisplayName;
import org.eclipse.jst.javaee.core.JavaeeFactory;
import org.eclipse.jst.javaee.web.Filter;
@@ -30,14 +31,16 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
/**
- * Install delegate for seam faset version 1.2
+ * Install delegate for seam facet version 1.2
*
* @author eskimo
*/
@@ -108,9 +111,34 @@
public static String DROOLS_LIB_SEAM_RELATED_PATH = "drools/lib"; //$NON-NLS-1$
- private void doExecuteForWar(final IProject project, IProjectFacetVersion fv,
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForEar(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForEar(final IProject project, IProjectFacetVersion fv,
IDataModel model, IProgressMonitor monitor) throws CoreException {
+ // TODO
+ }
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForEjb(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForEjb(final IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException {
+ // TODO
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecuteForWar(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ protected void doExecuteForWar(final IProject project, IProjectFacetVersion fv,
+ IDataModel model, IProgressMonitor monitor) throws CoreException {
+
// get WebContents folder path from DWP model
IVirtualComponent component = ComponentCore.createComponent(project);
IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
@@ -280,17 +308,6 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#doExecute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void doExecute(final IProject project, IProjectFacetVersion fv,
- Object config, IProgressMonitor monitor) throws CoreException {
- final IDataModel model = (IDataModel)config;
-
- doExecuteForWar(project, fv, model, monitor);
- }
-
- /*
- * (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp)
*/
@Override
16 years, 3 months
JBoss Tools SVN: r10689 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-06 10:58:09 -0400 (Mon, 06 Oct 2008)
New Revision: 10689
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
Log:
JBIDE-2802
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-10-06 14:02:52 UTC (rev 10688)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-10-06 14:58:09 UTC (rev 10689)
@@ -270,7 +270,42 @@
public void changeObjectAttribute(XModelObject object, String attributeName, String value) throws XModelException {
changeObjectAttribute(object, attributeName, value, false);
}
-
+
+ /**
+ * Returns validation error.
+ * @param object
+ * @param attributeName
+ * @param value
+ * @return
+ */
+ public String getError(XModelObject object, String attributeName, String value) {
+ if(object == null || object.getPath() == null) return null;
+ XModelEntity ent = object.getModelEntity();
+ XAttribute a = ent.getAttribute(attributeName);
+ if(a == null) return null;
+ if(a.isTrimmable() && value != null) value = value.trim();
+ String ov = object.getAttributeValue(attributeName);
+ ov = (ov == null) ? "" : ov;
+ if(!isDifferent(ov, value)) return null;
+ if(value.length() == 0 && "true".equals(a.getProperty("required"))) {
+ String mes = "Attribute " + a.getName() + " is required.";
+ return mes;
+ }
+ XAttributeConstraint c = a.getConstraint();
+ if(c != null && service != null) {
+ String error = (c instanceof XAttributeConstraintV)
+ ? ((XAttributeConstraintV)c).getError(value, object)
+ : c.getError(value);
+ if(error != null) {
+ String mes = XBundle.getInstance().getMessage("model",
+ "SET_ATTRIBUTE_FAILURE",
+ new Object[]{attributeName, value, error});
+ return mes;
+ }
+ }
+ return null;
+ }
+
void changeObjectAttribute(XModelObject object, String attributeName, String value, boolean edit) throws XModelException {
if(object == null || object.getPath() == null) return;
XModelEntity ent = object.getModelEntity();
16 years, 3 months
JBoss Tools SVN: r10688 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-06 10:02:52 -0400 (Mon, 06 Oct 2008)
New Revision: 10688
Modified:
trunk/as/docs/reference/en/modules/perspective.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-433 - adding a note;
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2008-10-06 12:55:31 UTC (rev 10687)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2008-10-06 14:02:52 UTC (rev 10688)
@@ -72,8 +72,8 @@
incremental publish if it turns out that the module in question is capable of doing one.</para>
<para>Now, let's get to know with both of the <property>JBoss Server
- View</property> parts.</para>
-
+ View</property> parts.</para>
+
<section role="updated">
<title>Top Part of the JBoss Server View</title>
<para>In the top part of the <property>JBoss Server View</property> all declared servers
@@ -164,12 +164,16 @@
port settings are configurable.</para>
<para>The settings relating to <emphasis>
- <property>Publishing</property></emphasis>, <emphasis>
- <property>Timeouts</property></emphasis> or <emphasis>
- <property>Server Polling</property></emphasis> can also be adjusted here.</para>
+ <property>Publishing</property>
+ </emphasis>, <emphasis>
+ <property>Timeouts</property>
+ </emphasis> or <emphasis>
+ <property>Server Polling</property>
+ </emphasis> can also be adjusted here.</para>
- <para id="com_line_arg">In the <property>Server editor</property> it's possible to modify the server's
- launch configuration as well. It's just after clicking <emphasis>
+ <para id="com_line_arg">In the <property>Server editor</property> it's possible
+ to modify the server's launch configuration as well. It's just
+ after clicking <emphasis>
<property>Open launch configuration</property>
</emphasis> link. In the open window there are the tabs for setting command line
arguments and other things that are relevant to launching the server.</para>
@@ -625,6 +629,15 @@
</imageobject>
</mediaobject>
</figure>
+
+ <note>
+ <title>Note:</title>
+ <para>If you see only JAR from the list of available archive types, you should
+ verify whether AS Tools plugins/features are in place. EAR, EJB JAR and WAR options are
+ contributed by the AS Tools independently from webtools and the virtual
+ project model. Thus, without them only JAR will show up.</para>
+ </note>
+
<para><property>JAR</property> is the standard archive type, and does very little
configuration, leaving most of the work up to you. You can customize the name, add
folders, filesets, and inner jars to it.</para>
16 years, 3 months
JBoss Tools SVN: r10687 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-06 08:55:31 -0400 (Mon, 06 Oct 2008)
New Revision: 10687
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
Log:
Issue JBIDE-2800 resolved.
Now if columnClasses are specified, every cell from a column has the same style.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-06 11:58:08 UTC (rev 10686)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-06 12:55:31 UTC (rev 10687)
@@ -353,8 +353,11 @@
pageContext);
List columnClasses = getClasses(columnClassesExpr, sourceNode,
pageContext);
- int rci = 0, cci = 0;
+
+ int rci = 0; // index of row class
for (int i = 0; i < rowCount; i++) {
+ int cci = 0; // index of column class. Reset on every new row.
+
nsIDOMElement visualRow = visualDocument
.createElement(HTML.TAG_TR);
if (rowClasses.size() > 0) {
16 years, 3 months
JBoss Tools SVN: r10686 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-06 07:58:08 -0400 (Mon, 06 Oct 2008)
New Revision: 10686
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
Log:
JBIDE-2853 Invalid thread access when adding a new runtime within ESB Project Wizard
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-10-06 11:17:13 UTC (rev 10685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-10-06 11:58:08 UTC (rev 10686)
@@ -87,12 +87,18 @@
public void handleEvent(IFacetedProjectEvent event) {
IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ESBProjectUtilities.ESB_PROJECT_FACET);
- IProjectFacetVersion version = fpwc.getProjectFacetVersion(facet);
- if(version != null){
- initializeRuntimesCombo(cmbRuntimes, null, version.getVersionString());
- }else{
- initializeRuntimesCombo(cmbRuntimes, null);
- }
+ final IProjectFacetVersion version = fpwc.getProjectFacetVersion(facet);
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ if(version != null){
+ initializeRuntimesCombo(cmbRuntimes, null, version.getVersionString());
+ }else{
+ initializeRuntimesCombo(cmbRuntimes, null);
+ }
+ }
+
+ });
}
}, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED);
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2008-10-06 11:17:13 UTC (rev 10685)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2008-10-06 11:58:08 UTC (rev 10686)
@@ -2,6 +2,7 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
@@ -22,5 +23,17 @@
protected void createPresetPanel(Composite top) {
new Label(top, SWT.NONE);
}
+
+ @Override
+ protected void validatePage() {
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ validatePage(true);
+ }
+
+ });
+
+ }
}
16 years, 3 months
JBoss Tools SVN: r10685 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-10-06 07:17:13 -0400 (Mon, 06 Oct 2008)
New Revision: 10685
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-06 10:57:10 UTC (rev 10684)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-06 11:17:13 UTC (rev 10685)
@@ -19,4 +19,9 @@
public static final String WHITE_SPACE = " "; //$NON-NLS-1$
public static final String YES_STRING = "yes"; //$NON-NLS-1$
public static final String JSP_FILE_EXTENSION = "jsp"; //$NON-NLS-1$
+ public static final String SEMICOLON = ";"; //$NON-NLS-1$
+ public static final String COLON = ":"; //$NON-NLS-1$
+ public static final String PIXEL = "px"; //$NON-NLS-1$
+ public static final String PERCENT = "%"; //$NON-NLS-1$
+ public static final String COMMA = ","; //$NON-NLS-1$
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-10-06 10:57:10 UTC (rev 10684)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-10-06 11:17:13 UTC (rev 10685)
@@ -84,13 +84,16 @@
public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$
public static final String ATTR_COLS = "cols"; //$NON-NLS-1$
public static final String ATTR_VALIGN = "valign"; //$NON-NLS-1$
+ public static final String ATTR_ALIGN = "align"; //$NON-NLS-1$
public static final String ATTR_SRC = "src"; //$NON-NLS-1$
public static final String ATTR_ALT = "alt"; //$NON-NLS-1$
public static final String ATTR_JSFC = "jsfc"; //$NON-NLS-1$
public static final String ATTR_DISPLAY = "display"; //$NON-NLS-1$
public static final String ATTR_READONLY = "readonly"; //$NON-NLS-1$
+ public static final String ATTR_SCOPE = "scope"; //$NON-NLS-1$
public static final String VALUE_TOP_ALIGN = "top"; //$NON-NLS-1$
+ public static final String VALUE_RIGHT_ALIGN = "right"; //$NON-NLS-1$
public static final String VALUE_MIDDLE_ALIGN = "middle"; //$NON-NLS-1$
public static final String VALUE_TEXT_TYPE = "text"; //$NON-NLS-1$
public static final String VALUE_PASSWORD_TYPE = "password"; //$NON-NLS-1$
@@ -99,5 +102,9 @@
public static final String VALUE_CHECKBOX_TYPE = "checkbox"; //$NON-NLS-1$
public static final String VALUE_HIDDEN_TYPE = "hidden"; //$NON-NLS-1$
public static final String VALUE_BUTTON_TYPE = "button"; //$NON-NLS-1$
+ public static final String VALUE_ALIGN_CENTER= "center"; //$NON-NLS-1$
+
+ public static final String STYLE_PARAMETER_WIDTH = "width"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_HEIGHT = "height"; //$NON-NLS-1$
}
\ No newline at end of file
16 years, 3 months
JBoss Tools SVN: r10684 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-06 06:57:10 -0400 (Mon, 06 Oct 2008)
New Revision: 10684
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java
Log:
Now h:body tag works.
isRecreateAtAttrChange method deleted from class org.jboss.tools.jsf.vpe.jsf.template.JsfBodyTemplate.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java 2008-10-06 10:49:27 UTC (rev 10683)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfBodyTemplate.java 2008-10-06 10:57:10 UTC (rev 10684)
@@ -13,18 +13,14 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
-//import org.jboss.tools.vpe.html.template.HtmlBodyTemplate;
+import org.jboss.tools.vpe.html.template.HtmlBodyTemplate;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-
/**
- * TODO There was code which didn't compile . It was commented .
- */
-/**
* A wrapper of VpeAbstractTemplate. Does the same, but ignores all attributes except id.
* @author yradtsevich
* @see HtmlBodyTemplate
@@ -32,11 +28,11 @@
public class JsfBodyTemplate extends VpeAbstractTemplate {
public static final String ID_ID = "id"; //$NON-NLS-1$
-// private final HtmlBodyTemplate htmlBodyTemplate = new HtmlBodyTemplate();
+ private final HtmlBodyTemplate htmlBodyTemplate = new HtmlBodyTemplate();
-// /**
-// * @see org.jboss.tools.vpe.html.template.HtmlBodyTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
-// */
+ /**
+ * @see org.jboss.tools.vpe.html.template.HtmlBodyTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ */
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
sourceNode = sourceNode.cloneNode(true);
@@ -50,22 +46,6 @@
}
}
-// return htmlBodyTemplate.create(pageContext, sourceNode, visualDocument);
- return null;
+ return htmlBodyTemplate.create(pageContext, sourceNode, visualDocument);
}
-
- // TODO: change to default implementation (remove)
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String)
- */
- @Override
- public boolean isRecreateAtAttrChange(VpePageContext pageContext,
- Element sourceElement, nsIDOMDocument visualDocument,
- nsIDOMElement visualNode, Object data, String name, String value) {
- // TODO: change to false
- return true;
- }
-
-
-
}
16 years, 3 months