JBoss Tools SVN: r13713 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-21 18:53:43 -0500 (Sat, 21 Feb 2009)
New Revision: 13713
Modified:
workspace/snjeza/seam-examples/booking-mavenized.zip
Log:
JBIDE-3711 Investigate why JBoss 5 doesn't seem to like our seam 2 deployments
Modified: workspace/snjeza/seam-examples/booking-mavenized.zip
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Tools SVN: r13712 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-02-20 16:28:30 -0500 (Fri, 20 Feb 2009)
New Revision: 13712
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/IValidationErrorManager.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3336 - Seam validator is called too often
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/IValidationErrorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/IValidationErrorManager.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/IValidationErrorManager.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -13,6 +13,7 @@
import java.util.Set;
import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamTextSourceReference;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -11,10 +11,8 @@
package org.jboss.tools.seam.internal.core.validation;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -59,7 +57,6 @@
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.internal.core.DataModelSelectionAttribute;
import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
-import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.internal.core.SeamTextSourceReference;
@@ -130,10 +127,9 @@
if(!validateUnnamedResources) {
String fileName = currentFile.getName().toLowerCase();
// We need to check only file names here.
- validateUnnamedResources = fileName.endsWith(".java") || fileName.equals("components.xml"); //$NON-NLS-1$ $NON-NLS-2$
+ validateUnnamedResources = fileName.endsWith(".java") || fileName.endsWith(".properties") || fileName.equals("components.xml"); //$NON-NLS-1$ $NON-NLS-2$
}
if (checkFileExtension(currentFile)) {
- validateXMLVersion(currentFile);
// Get all variable names which were linked with this resource.
Set<String> oldVariablesNamesOfChangedFile = validationContext.getVariableNamesByCoreResource(currentFile.getFullPath());
if(oldVariablesNamesOfChangedFile!=null) {
@@ -171,12 +167,20 @@
// Validate all collected linked resources.
// Remove all links between collected resources and variables names because they will be linked again during validation.
validationContext.removeLinkedCoreResources(resources);
+
+ IFile[] filesToValidate = new IFile[resources.size()];
+ int i = 0;
+ // We have to remove markers from all collected source files first
for (IPath linkedResource : resources) {
- // Remove markers from collected source file
- IFile sourceFile = root.getFile(linkedResource);
- reporter.removeMessageSubset(validationManager, sourceFile, ISeamValidator.MARKED_SEAM_RESOURCE_MESSAGE_GROUP);
+ filesToValidate[i] = root.getFile(linkedResource);
+ removeAllMessagesFromResource(filesToValidate[i++]);
+ }
+ i = 0;
+ // Then we can validate them
+ for (IPath linkedResource : resources) {
validateComponent(linkedResource, checkedComponents, newResources);
validateFactory(linkedResource, markedDuplicateFactoryNames);
+ validateXMLVersion(filesToValidate[i++]);
}
// If changed files are *.java or component.xml then re-validate all unnamed resources.
@@ -184,10 +188,16 @@
Set<IPath> unnamedResources = validationContext.getUnnamedCoreResources();
newResources.addAll(unnamedResources);
for (IPath path : newResources) {
- displaySubtask(VALIDATING_RESOURCE_MESSAGE_ID, new String[]{projectName, path.toString()});
- Set<ISeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path);
- for (ISeamJavaComponentDeclaration d : declarations) {
- validateMethodsOfUnknownComponent(d);
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if(file!=null && file.exists()) {
+ if(!resources.contains(path)) {
+ removeAllMessagesFromResource(file);
+ }
+ displaySubtask(VALIDATING_RESOURCE_MESSAGE_ID, new String[]{projectName, path.toString()});
+ Set<ISeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path);
+ for (ISeamJavaComponentDeclaration d : declarations) {
+ validateMethodsOfUnknownComponent(d);
+ }
}
}
}
@@ -200,12 +210,19 @@
* @see org.jboss.tools.seam.internal.core.validation.ISeamValidator#validateAll()
*/
public IStatus validateAll() throws ValidationException {
+ removeAllMessagesFromResource(seamProject.getProject());
ISeamComponent[] components = seamProject.getComponents();
for (ISeamComponent component : components) {
if(reporter.isCancelled()) {
return OK_STATUS;
}
- validateComponent(component);
+ Set<ISeamComponentDeclaration> declarations = component.getAllDeclarations();
+ for (ISeamComponentDeclaration seamComponentDeclaration : declarations) {
+ if(project == seamComponentDeclaration.getResource().getProject()) {
+ validateComponent(component);
+ break;
+ }
+ }
}
ISeamFactory[] factories = seamProject.getFactories();
Set<String> markedDuplicateFactoryNames = new HashSet<String>();
@@ -213,7 +230,9 @@
if(reporter.isCancelled()) {
return OK_STATUS;
}
- validateFactory(factory, markedDuplicateFactoryNames);
+ if(project == factory.getResource().getProject()) {
+ validateFactory(factory, markedDuplicateFactoryNames);
+ }
}
ISeamJavaComponentDeclaration[] values = ((SeamProject)seamProject).getAllJavaComponentDeclarations();
@@ -222,7 +241,9 @@
return OK_STATUS;
}
displaySubtask(VALIDATING_CLASS_MESSAGE_ID, new String[]{projectName, d.getClassName()});
- validateMethodsOfUnknownComponent(d);
+ if(project == d.getResource().getProject()) {
+ validateMethodsOfUnknownComponent(d);
+ }
}
return OK_STATUS;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -12,6 +12,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -44,6 +45,7 @@
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -114,17 +116,34 @@
IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
Set<IPath> files = validationContext.getElResourcesForValidation(changedFiles);
validationContext.removeLinkedElResources(files);
+
+ Set<IFile> filesToValidate = new HashSet<IFile>();
+ boolean containsJavaOrComponentsXml = false;
for (IPath path : files) {
- if(!reporter.isCancelled()) {
- validationContext.removeUnnamedElResource(path);
+ IFile file = wsRoot.getFile(path);
+ if(file.exists()) {
+ filesToValidate.add(file);
+ if(!containsJavaOrComponentsXml) {
+ String fileName = file.getName().toLowerCase();
+ containsJavaOrComponentsXml = fileName.endsWith(".java") || fileName.endsWith(".properties") || fileName.equals("components.xml"); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+ }
+ }
+ }
+
+ if(containsJavaOrComponentsXml) {
+ Set<IPath> unnamedResources = validationContext.getUnnamedElResources();
+ for (IPath path : unnamedResources) {
IFile file = wsRoot.getFile(path);
if(file.exists()) {
- reporter.removeMessageSubset(validationManager, file, ISeamValidator.MARKED_SEAM_RESOURCE_MESSAGE_GROUP);
- validateFile(file);
+ filesToValidate.add(file);
}
}
}
-
+ for (IFile file : filesToValidate) {
+ if(!reporter.isCancelled()) {
+ validateFile(file);
+ }
+ }
validationContext.clearOldVariableNameForElValidation();
return OK_STATUS;
}
@@ -196,6 +215,7 @@
if(!shouldFileBeValidated(file)) {
return;
}
+ WorkbenchReporter.removeAllMessages(file, new String[]{this.getClass().getName()}, null);
displaySubtask(VALIDATING_EL_FILE_MESSAGE_ID, new String[]{projectName, file.getName()});
elVarSearcher.setFile(file);
String ext = file.getFileExtension();
@@ -354,16 +374,16 @@
SeamELOperandResolveStatus status =
engine.resolveELOperand(file, operandToken, true, varListForCurentValidatedNode, elVarSearcher);
- if(status.getUsedVariables().size()==0 && status.isError()) {
+ if(status.isError()) {
// Save resources with unknown variables names
validationContext.addUnnamedElResource(file.getFullPath());
- } else {
- // Save links between resource and used variables names
- for(ISeamContextVariable variable: status.getUsedVariables()) {
- validationContext.addLinkedElResource(variable.getName(), file.getFullPath());
- }
}
+ // Save links between resource and used variables names
+ for(ISeamContextVariable variable: status.getUsedVariables()) {
+ validationContext.addLinkedElResource(variable.getName(), file.getFullPath());
+ }
+
// Check pair for getter/setter
if(status.getUnpairedGettersOrSetters().size()>0) {
TypeInfoCollector.MethodInfo unpairedMethod = status.getUnpairedGettersOrSetters().values().iterator().next();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationContext.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -185,7 +185,7 @@
}
}
}
- result.addAll(elLinks.getUnnamedResources());
+// result.addAll(elLinks.getUnnamedResources());
return result;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -62,7 +62,7 @@
if(changedFiles.size()>0) {
status = validate(validators, changedFiles);
} else {
- reporter.removeAllMessages(this);
+// reporter.removeAllMessages(this);
validationContext.clearAllResourceLinks();
status = validateAll(validators);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java 2009-02-20 19:19:21 UTC (rev 13711)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java 2009-02-20 21:28:30 UTC (rev 13712)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
@@ -158,7 +159,8 @@
}
}
- reporter.addMessage(validationManager, message);
+ WorkbenchReporter.addMessage(target, this.getClass(), message);
+// reporter.addMessage(validationManager, message);
}
/*
@@ -188,7 +190,8 @@
e);
return;
}
- reporter.addMessage(validationManager, message);
+ WorkbenchReporter.addMessage(target, this.getClass(), message);
+// reporter.addMessage(validationManager, message);
}
/*
@@ -219,7 +222,7 @@
*/
public void removeMessagesFromResources(Set<IResource> resources) {
for (IResource r : resources) {
- reporter.removeMessageSubset(validationManager, r, getMarkerId());
+ WorkbenchReporter.removeAllMessages(r, new String[]{this.getClass().getName()}, null);
}
}
@@ -228,7 +231,8 @@
* @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#removeAllMessagesFromResource(org.eclipse.core.resources.IResource)
*/
public void removeAllMessagesFromResource(IResource resource) {
- reporter.removeAllMessages(validationManager, resource);
+// reporter.removeAllMessages(validationManager, resource);
+ WorkbenchReporter.removeAllMessages(resource, new String[]{this.getClass().getName()}, null);
}
/*
16 years, 10 months
JBoss Tools SVN: r13711 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-02-20 14:19:21 -0500 (Fri, 20 Feb 2009)
New Revision: 13711
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
Log:
JBIDE-3787
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 18:28:12 UTC (rev 13710)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 19:19:21 UTC (rev 13711)
@@ -279,18 +279,23 @@
XMLHelper xmlHelper = new XMLHelper();
InputStream stream = null;
String resourceName = "<unknown>"; //$NON-NLS-1$
- try {
- if(configXMLFile!=null) {
- resourceName = configXMLFile.toString();
+ if(configXMLFile!=null) {
+ resourceName = configXMLFile.toString();
+ try {
stream = new FileInputStream( configXMLFile );
- } else {
- resourceName = "/hibernate.cfg.xml"; //$NON-NLS-1$
+ }
+ catch (FileNotFoundException e1) {
+ throw new HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_access + configXMLFile, e1);
+ }
+ } else {
+ resourceName = "/hibernate.cfg.xml"; //$NON-NLS-1$
+ if (checkHibernateResoureExistence(resourceName)) {
stream = ConfigHelper.getResourceAsStream( resourceName ); // simulate hibernate's default look up
}
+ else {
+ return localCfg;
+ }
}
- catch (FileNotFoundException e1) {
- throw new HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_access + configXMLFile, e1);
- }
try {
List errors = new ArrayList();
@@ -334,10 +339,24 @@
if(configXMLFile!=null) {
return localCfg.configure(configXMLFile);
} else {
- return localCfg.configure();
+ Configuration resultCfg = localCfg;
+ if (checkHibernateResoureExistence("/hibernate.cfg.xml")) { //$NON-NLS-1$
+ resultCfg = localCfg.configure();
+ }
+ return resultCfg;
}
}
}
+
+ protected boolean checkHibernateResoureExistence(String resource) {
+ InputStream is = null;
+ try {
+ is = ConfigHelper.getResourceAsStream(resource);
+ } catch(HibernateException e) {
+ // just ignore
+ }
+ return( is != null );
+ }
/**
* DriverManager checks what classloader a class is loaded from thus
@@ -581,7 +600,7 @@
// replace dialect if it is set in preferences
if(StringHelper.isNotEmpty( prefs.getDialectName())) {
- localCfg.setProperty("hibernate.dialect", prefs.getDialectName());
+ localCfg.setProperty("hibernate.dialect", prefs.getDialectName()); //$NON-NLS-1$
}
return localCfg;
16 years, 10 months
JBoss Tools SVN: r13710 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-02-20 13:28:12 -0500 (Fri, 20 Feb 2009)
New Revision: 13710
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
Log:
JBIDE-3787 revert back till the better solution
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 17:26:17 UTC (rev 13709)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2009-02-20 18:28:12 UTC (rev 13710)
@@ -290,12 +290,6 @@
}
catch (FileNotFoundException e1) {
throw new HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_access + configXMLFile, e1);
- } catch(HibernateException e) {
- boolean cfgXmlNotFound = ( e.getMessage().indexOf("/hibernate.cfg.xml not found") != -1 ); //$NON-NLS-1$
- if (!cfgXmlNotFound) {
- throw e;
- }
- return localCfg;
}
try {
@@ -340,16 +334,7 @@
if(configXMLFile!=null) {
return localCfg.configure(configXMLFile);
} else {
- Configuration resultCfg = localCfg;
- try {
- resultCfg = localCfg.configure();
- } catch(HibernateException e) {
- boolean cfgXmlNotFound = ( e.getMessage().indexOf("/hibernate.cfg.xml not found") != -1 ); //$NON-NLS-1$
- if (!cfgXmlNotFound) {
- throw e;
- }
- }
- return resultCfg;
+ return localCfg.configure();
}
}
}
16 years, 10 months
JBoss Tools SVN: r13709 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-02-20 12:26:17 -0500 (Fri, 20 Feb 2009)
New Revision: 13709
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
updated hibernate tools to get latest fixes
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Tools SVN: r13708 - trunk/jsf/docs/userguide/en.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-02-20 12:15:12 -0500 (Fri, 20 Feb 2009)
New Revision: 13708
Modified:
trunk/jsf/docs/userguide/en/master.xml
Log:
no changes
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2009-02-20 17:11:36 UTC (rev 13707)
+++ trunk/jsf/docs/userguide/en/master.xml 2009-02-20 17:15:12 UTC (rev 13708)
@@ -23,7 +23,7 @@
<!ENTITY strutsreflink "../../struts_tools_ref_guide/html_single/index.html">
<!ENTITY strutstutoriallink "../../struts_tools_tutorial/html_single/index.html">
<!ENTITY migrationlink "../../Exadel-migration/html_single/index.html">
-
+
]>
<book>
<bookinfo>
16 years, 10 months
JBoss Tools SVN: r13707 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-02-20 12:11:36 -0500 (Fri, 20 Feb 2009)
New Revision: 13707
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-622 - content updated for Page Design Options: the window changed to a window with 4 tabs.
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-02-20 17:00:20 UTC (rev 13706)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-02-20 17:11:36 UTC (rev 13707)
@@ -1231,23 +1231,58 @@
<listitem>
<para><emphasis>
<property>Page Design Options</property>
- </emphasis> button leads to window which helps you to specify necessary
- references to resources. Here is what this window looks like.</para>
+ </emphasis> button leads to the window which helps you to specify necessary
+ references to the resources. It is represented by a window with 4 tabs. The first one, <emphasis><property>Actual Run-Time folders</property></emphasis>, is used to replace absolute and relative path values when generating a preview: </para>
<figure>
- <title>Page Design Options</title>
+ <title>Page Design Options: Actual Run-Time folders</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/visual_page/visual_page_10.png"/>
</imageobject>
</mediaobject>
</figure>
+
+
+ <para>The second tab, <emphasis><property>Included CSS files</property></emphasis>, is used to add CSS files to be linked by Visual Page Editor when generating a preview:</para>
+
+ <figure>
+ <title>Page Design Options: Included CSS files</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_10_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+
+
+
+ <para>The third one, <emphasis><property>Included tag libs</property></emphasis>, can be used to add Taglibs that can be used by the editor for getting appropriate templates to generate a preview:</para>
+
+ <figure>
+ <title>Page Design Options: Included tag libs</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_10_3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>And finally, the <emphasis><property>Substituted El expressions</property></emphasis> tab is used to add El expressions that will be substituted by the editor when generating a preview:</para>
+
+ <figure>
+ <title>Page Design Options: Substituted El expressions</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_10_4.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
- <para>This dialog lets you set resources which are usually only resolved in
- runtime. Let's look at what functionality it proposes.</para>
-
- <para>The first two sections of the window let you define actual runtime
+ <para>The first two tabs of the window let you define actual runtime
folders. The example below will help you to clarify how this can be
- used.</para>
+ done.</para>
<para>Suppose you have the following project structure:</para>
@@ -1282,18 +1317,7 @@
pages'</emphasis> and you will see the image appeared.</para>
<para/>
- <para id="el_exp_para">In the bottom part of the window you can set a path to
- included css files, tag libs and substituted EL expressions.</para>
- <figure>
- <title>Bottom Part of the Page Design Options</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_11.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>Let' consider an example. For instance, the definition of your
+ <para>Let' consider an example for other tabs. For instance, the definition of your
CSS on the page is the next:</para>
<programlisting role="XML"><![CDATA[<link rel="stylesheet" type="text/css"
16 years, 10 months
JBoss Tools SVN: r13706 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-02-20 12:00:20 -0500 (Fri, 20 Feb 2009)
New Revision: 13706
Added:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_4.png
Log:
https://jira.jboss.org/jira/browse/JBDS-622
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 10 months
JBoss Tools SVN: r13705 - in trunk/vpe/tests: org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-20 11:56:35 -0500 (Fri, 20 Feb 2009)
New Revision: 13705
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3793, tests for vpe ui(dialog and pref page) was moved from vpe non-ui tests to vpe ui tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2009-02-20 16:56:35 UTC (rev 13705)
@@ -8,20 +8,11 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.junit,
- org.jboss.tools.common,
org.jboss.tools.vpe,
- org.jboss.tools.jst.jsp,
- org.jboss.tools.vpe.ui.test,
org.jboss.tools.jsf.vpe.jsf.test,
- org.jboss.tools.jsf.vpe.richfaces.test,
- org.jboss.tools.common.model,
- org.jboss.tools.jsf.vpe.richfaces,
- org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom,
- org.jboss.tools.tests;bundle-version="2.0.0",
org.jboss.tools.common.model.ui;bundle-version="2.0.0",
org.eclipse.jface.text;bundle-version="3.4.0"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.editor.preferences,
org.jboss.tools.vpe.editor.template,
org.jboss.tools.vpe.test
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java 2009-02-20 16:56:35 UTC (rev 13705)
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.editor.dialogs;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.swt.widgets.Shell;
-import org.jboss.tools.common.model.options.PreferenceModelUtilities;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
-import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryDialog;
-import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.vpe.resref.VpeResourcesDialog;
-import org.jboss.tools.vpe.ui.test.TestUtil;
-
-import junit.framework.TestCase;
-
-public class VpeResourcesDialogTest extends TestCase {
-
- private final String BUNDLE_NAME = "org.jboss.tools.vpe.test"; //$NON-NLS-1$
- private final String PROJECT_PATH = "resources/TestProject"; //$NON-NLS-1$
- private final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$
- private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$
-
- private IProject project;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- project = (IProject) ResourcesPlugin.getWorkspace().getRoot()
- .findMember(PROJECT_NAME);
- if (project == null) {
- ProjectImportTestSetup setup = new ProjectImportTestSetup(this,
- BUNDLE_NAME, PROJECT_PATH, PROJECT_NAME);
- project = setup.importProject();
- }
- this.project = project.getProject();
-
- JobUtils.waitForIdle();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- try {
- JobUtils.waitForIdle();
- if (project != null) {
- project.close(new NullProgressMonitor());
- project.delete(true, new NullProgressMonitor());
- project = null;
- JobUtils.waitForIdle();
- }
- } finally {
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
- }
-
- public void testVpeResourcesDialogOpen() throws Throwable {
-
- IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME,
- PROJECT_NAME);
-
- assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$
- + "; projectName = " + PROJECT_NAME, file); //$NON-NLS-1$
-
- VpeResourcesDialog dialog = new VpeResourcesDialog();
- Properties p = new Properties();
- p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$
- p.put("file", file); //$NON-NLS-1$
- p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$
- dialog.setObject(p);
- Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
- IQueryDialog dialogWindow = new AbstractQueryDialog(shell);
-
- dialogWindow.setView(dialog.getView());
- dialogWindow.getDialog().create();
- dialog.getView().setDialog(dialogWindow.getDialog());
- dialogWindow.getDialog().setBlockOnOpen(false);
- dialogWindow.getDialog().open();
- int code = dialogWindow.getDialog().getReturnCode();
-
- /*
- * Assert that window has been created.
- */
- assertEquals(0, code);
-
- dialogWindow.getDialog().close();
- }
-
-
-}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2009-02-20 16:56:35 UTC (rev 13705)
@@ -12,16 +12,12 @@
import java.util.ArrayList;
import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.jboss.tools.jsf.vpe.jsf.test.JsfComponentTest;
import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.tests.ImportBean;
-import org.jboss.tools.vpe.editor.dialogs.VpeResourcesDialogTest;
-import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPageTest;
import org.jboss.tools.vpe.editor.template.VpeTemplateManagerTest;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
@@ -40,8 +36,6 @@
suite.addTestSuite(TemplateLoadingTest.class);
suite.addTestSuite(TemplateSchemeValidateTest.class);
suite.addTestSuite(TemplatesExpressionParsingTest.class);
- suite.addTestSuite(VpeEditorPreferencesPageTest.class);
- suite.addTestSuite(VpeResourcesDialogTest.class);
suite.addTestSuite(VpeTemplateManagerTest.class);
List<ImportBean> projectToImport = new ArrayList<ImportBean>();
ImportBean importBean = new ImportBean();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath 2009-02-20 16:56:35 UTC (rev 13705)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2009-02-20 16:56:35 UTC (rev 13705)
@@ -19,9 +19,11 @@
org.jboss.tools.jst.firstrun,
org.eclipse.wst.server.core,
org.eclipse.jface.text,
+ org.jboss.tools.common.model.ui;bundle-version="2.0.0",
org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Export-Package: org.jboss.tools.vpe.ui.test
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2009-02-20 16:56:22 UTC (rev 13704)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/plugin.xml 2009-02-20 16:56:35 UTC (rev 13705)
@@ -2,4 +2,12 @@
<?eclipse version="3.2"?>
<plugin>
<extension-point id="org.jboss.tools.vpe.ui.tests" name="Visual Page Editor Junit Test" schema="schema/vpe.tests.exsd"/>
+ <extension
+ point="org.jboss.tools.vpe.ui.tests">
+ <tests
+ description="UI tests of VPE components"
+ name="UI tests of VPE"
+ testSuite="org.jboss.tools.vpe.ui.test.VpeUiTests">
+ </tests>
+ </extension>
</plugin>
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-02-20 16:56:35 UTC (rev 13705)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test;
+
+import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
+import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class VpeUiTests {
+
+ public static Test suite(){
+ TestSuite suite = new TestSuite("UI Tests for vpe"); //$NON-NLS-1$
+ suite.addTestSuite(VpeResourcesDialogTest.class);
+ suite.addTestSuite(VpeEditorPreferencesPageTest.class);
+ return suite;
+ }
+}
Copied: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java (from rev 13697, trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-02-20 16:56:35 UTC (rev 13705)
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test.dialog;
+
+import java.util.Properties;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryDialog;
+import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.vpe.resref.VpeResourcesDialog;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+
+import junit.framework.TestCase;
+
+public class VpeResourcesDialogTest extends TestCase {
+
+ private final String BUNDLE_NAME = "org.jboss.tools.vpe.test"; //$NON-NLS-1$
+ private final String PROJECT_PATH = "resources/TestProject"; //$NON-NLS-1$
+ private final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$
+ private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$
+
+ private IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ project = (IProject) ResourcesPlugin.getWorkspace().getRoot()
+ .findMember(PROJECT_NAME);
+ if (project == null) {
+ ProjectImportTestSetup setup = new ProjectImportTestSetup(this,
+ BUNDLE_NAME, PROJECT_PATH, PROJECT_NAME);
+ project = setup.importProject();
+ }
+ this.project = project.getProject();
+
+ JobUtils.waitForIdle();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ JobUtils.waitForIdle();
+ if (project != null) {
+ project.close(new NullProgressMonitor());
+ project.delete(true, new NullProgressMonitor());
+ project = null;
+ JobUtils.waitForIdle();
+ }
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+ }
+
+ public void testVpeResourcesDialogOpen() throws Throwable {
+
+ IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME,
+ PROJECT_NAME);
+
+ assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$
+ + "; projectName = " + PROJECT_NAME, file); //$NON-NLS-1$
+
+ VpeResourcesDialog dialog = new VpeResourcesDialog();
+ Properties p = new Properties();
+ p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$
+ p.put("file", file); //$NON-NLS-1$
+ p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$
+ dialog.setObject(p);
+ Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+ IQueryDialog dialogWindow = new AbstractQueryDialog(shell);
+
+ dialogWindow.setView(dialog.getView());
+ dialogWindow.getDialog().create();
+ dialog.getView().setDialog(dialogWindow.getDialog());
+ dialogWindow.getDialog().setBlockOnOpen(false);
+ dialogWindow.getDialog().open();
+ int code = dialogWindow.getDialog().getReturnCode();
+
+ /*
+ * Assert that window has been created.
+ */
+ assertEquals(0, code);
+
+ dialogWindow.getDialog().close();
+ }
+
+
+}
Copied: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java (from rev 13697, trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPageTest.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/preferences/VpeEditorPreferencesPageTest.java 2009-02-20 16:56:35 UTC (rev 13705)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.test.preferences;
+
+import junit.framework.TestCase;
+
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.jboss.tools.test.util.WorkbenchUtils;
+import org.jboss.tools.vpe.editor.preferences.ELVariablesPreferencePage;
+import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage;
+
+public class VpeEditorPreferencesPageTest extends TestCase {
+ public void testVpeEditorPreferencesPageShow() {
+ PreferenceDialog prefDialog =
+ WorkbenchUtils.createPreferenceDialog(
+ VpeEditorPreferencesPage.ID);
+
+ try {
+ prefDialog.setBlockOnOpen(false);
+ prefDialog.open();
+
+ Object selectedPage = prefDialog.getSelectedPage();
+ assertTrue("Selected page is not an instance of org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage", selectedPage instanceof VpeEditorPreferencesPage); //$NON-NLS-1$
+ } finally {
+ prefDialog.close();
+ }
+ }
+
+ public void testVpeEditorELPreferencesPageShow() {
+ PreferenceDialog prefDialog =
+ WorkbenchUtils.createPreferenceDialog(
+ ELVariablesPreferencePage.ID);
+
+ try {
+ prefDialog.setBlockOnOpen(false);
+ prefDialog.open();
+
+ Object selectedPage = prefDialog.getSelectedPage();
+ assertTrue("Selected page is not an instance of org.jboss.tools.vpe.editor.preferences.ELVariablesPreferencePage", selectedPage instanceof ELVariablesPreferencePage); //$NON-NLS-1$
+ } finally {
+ prefDialog.close();
+ }
+ }
+}
16 years, 10 months
JBoss Tools SVN: r13704 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-02-20 11:56:22 -0500 (Fri, 20 Feb 2009)
New Revision: 13704
Added:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_3.png
Log:
https://jira.jboss.org/jira/browse/JBDS-622
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 10 months