JBoss Tools SVN: r9701 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/924 and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-08-13 11:01:48 -0400 (Wed, 13 Aug 2008)
New Revision: 9701
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/pages/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/pages/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/templates/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/templates/common.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
junit for JBIDE-924
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/pages/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/pages/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/pages/inputname.xhtml 2008-08-13 15:01:48 UTC (rev 9701)
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+
+ <ui:composition template="/templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton" id="submit"
+ action="greeting" value="Say Hello" />
+ </form>
+
+ </ui:define>
+ </ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/templates/common.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/templates/common.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/924/templates/common.xhtml 2008-08-13 15:01:48 UTC (rev 9701)
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ <style type="text/css">
+ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ }
+ .header {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 18px;
+ }
+ .bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+ }
+ </style>
+ </head>
+
+<body bgcolor="#ffffff">
+<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400">
+<tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle">
+
+ <ui:insert name="body">Page Body</ui:insert>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+</tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-08-13 15:01:25 UTC (rev 9700)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-08-13 15:01:48 UTC (rev 9701)
@@ -36,6 +36,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2594Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test;
@@ -88,6 +89,7 @@
suite.addTestSuite(JBIDE2010Test.class);
suite.addTestSuite(JBIDE2582Test.class);
suite.addTestSuite(JBIDE2594Test.class);
+ suite.addTestSuite(JBIDE924Test.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-08-13 15:01:48 UTC (rev 9701)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* Copyright (c) 2007-2008 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.jsf.vpe.jsf.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.css.AbsoluteFolderReferenceList;
+import org.jboss.tools.vpe.editor.css.ResourceReference;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * @author mareshkau
+ *
+ * JUnit for JBIDE-924
+ */
+public class JBIDE924Test extends VpeTest{
+
+ public JBIDE924Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE924() throws Throwable {
+
+ // get test page path
+ setException(null);
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/924/pages/inputname.xhtml", //$NON-NLS-1$
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ VpeController vpeController = getVpeController(part);
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMElement element = document.getDocumentElement();
+ List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+ TestUtil.findAllElementsByName(element, elements, HTML.TAG_TABLE);
+ assertTrue("Faceletes loaded, but shouldn't",elements.size()==0); //$NON-NLS-1$
+ ResourceReference[] resourceReference = new ResourceReference[1];
+ resourceReference[0] = new ResourceReference(file.getParent().getParent().getLocation().toString() ,ResourceReference.FILE_SCOPE);
+ AbsoluteFolderReferenceList.getInstance().setAllResources(file, resourceReference );
+ TestUtil.delay(10000);
+ vpeController.visualRefresh();
+ TestUtil.delay(10000);
+ document = getVpeVisualDocument(part);
+ element = document.getDocumentElement();
+ elements = new ArrayList<nsIDOMNode>();
+ TestUtil.findAllElementsByName(element, elements, HTML.TAG_TABLE);
+
+ assertTrue("Faceletes wasn't loaded from specified path",elements.size()>=1); //$NON-NLS-1$
+ if(getException()!=null) {
+
+ throw getException();
+ }
+ }
+
+}
17 years, 4 months
JBoss Tools SVN: r9700 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-08-13 11:01:25 -0400 (Wed, 13 Aug 2008)
New Revision: 9700
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
Log:
Fix JBIDE-2617 issue.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-08-13 15:00:04 UTC (rev 9699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-08-13 15:01:25 UTC (rev 9700)
@@ -96,7 +96,7 @@
if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600);
//changed by estherbin
//http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(800, 600);
+ return new Point(600, 700);
}
}
17 years, 4 months
JBoss Tools SVN: r9699 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-08-13 11:00:04 -0400 (Wed, 13 Aug 2008)
New Revision: 9699
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties
Log:
JBIDE-2619 fixed broken i18n messages
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties 2008-08-13 14:58:49 UTC (rev 9698)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleMessages.properties 2008-08-13 15:00:04 UTC (rev 9699)
@@ -7,7 +7,7 @@
ConsoleConfiguration_could_not_parse_configuration=Could not parse configuration:
ConsoleConfiguration_factory_not_closed_before_build_new_factory=Factory were not closed before attempting to built a new factory.
ConsoleConfiguration_invalid_configuration=invalid configuration
-ConsoleConfiguration_persistence_unit_not_found=Persistence unit not found: '{0}'.
+ConsoleConfiguration_persistence_unit_not_found=Persistence unit not found: ''{0}''.
ConsoleConfiguration_problems_while_loading_database_driverclass=Problems while loading database driverclass ({0})
JavaPage_no_info=<no info>
JavaPage_not_allowed=System.exit not allowed\!
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-08-13 14:58:49 UTC (rev 9698)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-08-13 15:00:04 UTC (rev 9699)
@@ -54,7 +54,7 @@
DeleteConfigurationAction_str_1=s
DeleteConfigurationAction_str_2=s
DeleteConfigurationAction_str_3=?
-EditConsoleConfiguration_could_not_find_launch_cfg=Could not find launch configuration for '{0}'
+EditConsoleConfiguration_could_not_find_launch_cfg=Could not find launch configuration for ''{0}''
EditConsoleConfiguration_edit_config=Edit Configuration
EditConsoleConfiguration_exception_while_edit_config=Exception while trying to edit configuration
EditConsoleConfiguration_no_launch_cfg_matched=No launch configuration matched the configuration named
@@ -68,7 +68,7 @@
OpenFileActionUtils_problems_while_get_project_package_fragment_roots=Problems while getting project package fragment roots
OpenMappingAction_cannot_find_mapping_file=Can't find mapping file.
OpenMappingAction_cannot_open_mapping_file=Can't open mapping file.
-OpenMappingAction_mapping_file_for_property_not_found=Mapping file for property '{0}' not found.
+OpenMappingAction_mapping_file_for_property_not_found=Mapping file for property ''{0}'' not found.
OpenMappingAction_mapping_for_not_found=Mapping for {0} not found.
OpenMappingAction_open_mapping_file=Open Mapping File
OpenMappingAction_selection_not_found=Selection not found.
@@ -76,12 +76,12 @@
OpenSourceAction_cannot_find_source_file=Can't find source file.
OpenSourceAction_cannot_open_source_file=Can't open source file.
OpenSourceAction_open_source_file=Open Source File
-OpenSourceAction_source_file_for_class_not_found=Source file for class '{0}' not found.
+OpenSourceAction_source_file_for_class_not_found=Source file for class ''{0}'' not found.
RefreshAction_refresh=Refresh
ExporterDefinition_problem_creating_exporter_class=Problem while creating exporter class
-ExporterFactory_output_dir_in_does_not_exist=Output directory '{0}' in {1} does not exist.
-ExporterFactory_template_dir_in_does_not_exist=Template directory '{0}' in {1} does not exist.
+ExporterFactory_output_dir_in_does_not_exist=Output directory ''{0}'' in {1} does not exist.
+ExporterFactory_template_dir_in_does_not_exist=Template directory ''{0}'' in {1} does not exist.
ExporterProperty_generate_ejb3_annotations=Generate EJB3 annotations
ExporterProperty_use_java5_syntax=Use Java 5 syntax
@@ -138,7 +138,7 @@
SchemaExportAction_error_while_performing_schemaexport=\ error(s) while performing SchemaExport, see Error Log for details
SchemaExportAction_exception_running_schemaexport=Exception while running SchemaExport
SchemaExportAction_run_schemaexport=Run SchemaExport
-SchemaExportAction_sure_run_schemaexport=Are you sure you want to run SchemaExport on '{0}'?
+SchemaExportAction_sure_run_schemaexport=Are you sure you want to run SchemaExport on ''{0}''?
ClearPlaceHolderJob_removing_place_holder=Removing place holder for pending node
PendingNode_error_getting_images=Error while getting images
@@ -158,9 +158,9 @@
ConsoleConfigurationCreationWizard_enable_hibernate_features=Enable Hibernate features for project
ConsoleConfigurationCreationWizard_error_finishing=Error while finishing Wizard
ConsoleConfigurationCreationWizard_missing_classes=Probably missing classes or errors with classloading
-ConsoleConfigurationCreationWizard_the_project=The project named '{0}' does not have Hibernate features enabled. Should it be updated to use {1} ?
-ConsoleConfigurationCreationWizard_the_project_named=The project named {0} does not have a default Hibernate configuration specified. Should it be updated to use {1} ?
-ConsoleConfigurationCreationWizard_the_project_named_have=The project named {0} have the {1} specified. Should it be updated to use {2} ?
+ConsoleConfigurationCreationWizard_the_project=The project named ''{0}'' does not have Hibernate features enabled. Should it be updated to use {1} ?
+ConsoleConfigurationCreationWizard_the_project_named=The project named ''{0}'' does not have a default Hibernate configuration specified. Should it be updated to use {1} ?
+ConsoleConfigurationCreationWizard_the_project_named_have=The project named ''{0}'' have the ''{1}'' specified. Should it be updated to use {2} ?
ConsoleConfigurationWizardPage_27=.jar
ConsoleConfigurationWizardPage_28=.zip
ConsoleConfigurationWizardPage_35=hbm.xml
@@ -457,7 +457,7 @@
ConsoleConfigurationTabGroup_classpath_must_be_set_or_restored_to_default=Classpath must be set or restored to default
DirectoryBrowseField_filesystem=Filesystem...
DirectoryBrowseField_workspace=Workspace..
-ExporterAttributes_could_not_locate_exporter_for_in=Could not locate exporter for '{0}' in {1}
+ExporterAttributes_could_not_locate_exporter_for_in=Could not locate exporter for ''{0}'' in {1}
ExporterSettingsTab_add=Add...
ExporterSettingsTab_add_exporter=Add exporter
ExporterSettingsTab_at_least_one_exporter_option_must_be_selected=At least one exporter option must be selected
17 years, 4 months
JBoss Tools SVN: r9698 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-13 10:58:49 -0400 (Wed, 13 Aug 2008)
New Revision: 9698
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
Log:
JBIDE-2612
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-08-13 14:58:42 UTC (rev 9697)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-08-13 14:58:49 UTC (rev 9698)
@@ -206,7 +206,7 @@
private void updatePageItem(ReferenceObjectImpl item) {
if(item.getReference() == null) {
- //TODO update virtual link to findBestMatch(path) element
+ updateUndeclaredPageItem(item);
return;
}
// if(item.isUpToDate()) return;
@@ -224,6 +224,30 @@
updateOutputs(item, cs);
}
+ private void updateUndeclaredPageItem(ReferenceObjectImpl item) {
+ //update virtual link to findBestMatch(path) element
+ XModelObject[] os = item.getChildren();
+ String path = item.getAttributeValue(ATTR_PATH);
+ String fvi = findBestMatch(path);
+ XModelObject g = getPage(fvi);
+ if(g != null && item != g) {
+ XModelObject output = item.getModel().createModelObject(ENT_DIAGRAM_ITEM_OUTPUT, null);
+ output.setAttributeValue(ATTR_ID, fvi);
+ output.setAttributeValue(ATTR_PATH, fvi);
+ String name = XModelObjectUtil.createNewChildName("output", item);
+ output.setAttributeValue(ATTR_NAME, name);
+
+ ReferenceObjectImpl r = (ReferenceObjectImpl)output;
+ r.setReference(null);
+
+ String target = (g == null) ? "" : g.getPathPart();
+ output.setAttributeValue(ATTR_TARGET, target);
+
+ item.addChild(output);
+ }
+
+ }
+
private XModelObject[] getPageTargets(XModelObject o) {
XModelObject[] ns = o.getChildren();
List<XModelObject> result = null;
17 years, 4 months
JBoss Tools SVN: r9697 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-08-13 10:58:42 -0400 (Wed, 13 Aug 2008)
New Revision: 9697
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java
Log:
JBIDE-2612
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-08-13 14:19:26 UTC (rev 9696)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-08-13 14:58:42 UTC (rev 9697)
@@ -24,6 +24,8 @@
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.gef.ui.actions.GEFActionConstants;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jst.web.model.ReferenceObject;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
import org.jboss.tools.seam.ui.pages.editor.edit.SelectionUtil;
@@ -66,6 +68,11 @@
IStructuredSelection ss = (IStructuredSelection)s;
XModelObject object = SelectionUtil.getTarget(ss.getFirstElement());
if(object != null) {
+ if(object.getModelEntity().getName().equals(SeamPagesConstants.ENT_DIAGRAM_ITEM_OUTPUT)
+ && object instanceof ReferenceObject && ((ReferenceObject)object).getReference() == null) {
+ //virtual link
+ return;
+ }
PagesDiagramEditPart part = (PagesDiagramEditPart)getViewer().getRootEditPart().getChildren().get(0);
Properties p = new Properties();
if(lastDownEvent != null) {
17 years, 4 months
JBoss Tools SVN: r9696 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-13 10:19:26 -0400 (Wed, 13 Aug 2008)
New Revision: 9696
Removed:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6a.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6b.png
Log:
https://jira.jboss.org/jira/browse/JBDS-383 - deleting unnecessary images
Deleted: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6a.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6b.png
===================================================================
(Binary files differ)
17 years, 4 months
JBoss Tools SVN: r9695 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-13 10:10:07 -0400 (Wed, 13 Aug 2008)
New Revision: 9695
Added:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_13.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_16.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_11.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
Log:
https://jira.jboss.org/jira/browse/JBDS-383 - adding and updating screens
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_10.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_11.png
===================================================================
(Binary files differ)
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_13.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_14.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_15.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_16.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_2.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_3.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_4.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_6.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
===================================================================
(Binary files differ)
Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_9.png
===================================================================
(Binary files differ)
17 years, 4 months
JBoss Tools SVN: r9694 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-13 10:07:46 -0400 (Wed, 13 Aug 2008)
New Revision: 9694
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-383 - adding info and screens about EL expression section in Page Design Options window
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-08-13 14:00:05 UTC (rev 9693)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-08-13 14:07:46 UTC (rev 9694)
@@ -761,10 +761,10 @@
<property>Visual Page Editor</property> (VPE). You can use the Visual Page Editor to
develop an application using any technology: JSF, Struts, JSP, HTML and others.</para>
- <para>Current VPE version has two tabs: <property>Visual/Source</property> and
+ <para>Current VPE version has three tabs: <property>Visual/Source</property>, <property>Source</property> and
<property>Preview</property>. To switch between the views you can use tabs at the
bottom of the VPE or the shortcuts <emphasis>
- <property>Ctrl + PageUp/Ctrl + PageDown</property>. </emphasis></para>
+ <property>Ctrl + PageUp/Ctrl + PageDown</property>.</emphasis></para>
<figure>
<title>Visual Page Editor</title>
@@ -775,7 +775,7 @@
</mediaobject>
</figure>
- <section>
+ <section id="visual_source">
<title>Visual/Source View</title>
<para>Using the <property>Visual/Source view</property> you can edit your pages in the
@@ -785,7 +785,7 @@
<title>Visual/Source View</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_3.png" scale="95"/>
+ <imagedata fileref="images/visual_page/visual_page_2.png" scale="95"/>
</imageobject>
</mediaobject>
</figure>
@@ -805,25 +805,26 @@
editing.</para>
</tip>
- <para>It should be pointed out that, no matter in
- what mode you are working, you get a full integration with
- <property>Properties</property> and <property>Outline views</property>:</para>
+ <para>It should be pointed out that, no matter in what mode you are working, you get a
+ full integration with <property>Properties</property> and <property>Outline
+ views</property>:</para>
<figure>
<title>Integration with Properties and Outline Views</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_4.png" scale="55"/>
+ <imagedata fileref="images/visual_page/visual_page_3.png" scale="55"/>
</imageobject>
</mediaobject>
</figure>
<para>It's also possible to use the <link linkend="palette">JBoss Tools
- Palette</link> to insert any tag from the list of tag libraries to the page you are editing with just a click or drag-and-drop.</para>
+ Palette</link> to insert any tag from the list of tag libraries to the page you are
+ editing with just a click or drag-and-drop.</para>
<figure>
<title>Inserting Tag From the Palette</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_5.png" scale="80"/>
+ <imagedata fileref="images/visual_page/visual_page_4.png" scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -846,13 +847,13 @@
<title>Text Formatting</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_6.png"/>
+ <imagedata fileref="images/visual_page/visual_page_5.png"/>
</imageobject>
</mediaobject>
</figure>
<para>For editing inline styles for DOM elements VPE also provides <property>CSS
- Dialog</property>. It can be called from <emphasis>
+ Dialog</property>. It can be called from <emphasis>
<property>style</property>
</emphasis> line in the <property>Properties view</property> for a currently
selected element.</para>
@@ -861,20 +862,21 @@
<title>Call the CSS Dialog</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_6a.png"/>
+ <imagedata fileref="images/visual_page/visual_page_6.png"/>
</imageobject>
</mediaobject>
</figure>
<para><property>CSS Dialog</property> has four tabs where css properties for text,
- background, borders and others can be specified. To see the result use a
- simple preview which is generated at the bottom of the <property>CSS Dialog</property>.</para>
+ background, borders and others can be specified. A simple preview which is
+ generated at the bottom of the <property>CSS Dialog</property> allows you to see
+ the changes before you apply them.</para>
<figure>
<title>CSS Dialog</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_6b.png"/>
+ <imagedata fileref="images/visual_page/visual_page_7.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -884,105 +886,191 @@
<title>Advanced Settings</title>
- <para>In the left vertical pane of the Visual part there are three buttons: Preferences, Refresh, Page
- Design Options.</para>
+ <para>In the left vertical pane of the Visual part there are three buttons: <emphasis>
+ <property>Preferences</property>, </emphasis><emphasis>
+ <property>Refresh</property>
+ </emphasis> and <emphasis>
+ <property>Page Design Options</property>.</emphasis></para>
<figure>
- <title>Visual Page Editor Buttons</title>
+ <title>Buttons on the Visual Part of VPE</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_7.png"/>
+ <imagedata fileref="images/visual_page/visual_page_8.png"/>
</imageobject>
</mediaobject>
</figure>
- <para><property>Preferences</property> button provides a quick access to Visual Page
- Editor preferences.</para>
+ <itemizedlist>
+ <listitem id="vpe_preferences">
+ <para><emphasis>
+ <property>Preferences</property>
+ </emphasis> button provides a quick access to <property>Visual Page
+ Editor</property> preferences.</para>
- <figure>
- <title>Visual Page Editor Preferences Window</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_9.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Visual Page Editor Preferences Window</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_9.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
- <para>Clicking on <property>Refresh</property> button you refresh the displaying
- information.</para>
+ <listitem>
+ <para>Clicking on <emphasis>
+ <property>Refresh</property>
+ </emphasis> button you refresh the displayed information.</para>
+ </listitem>
- <para><property>Page Design Options</property> button leads to page design options.</para>
- <figure>
- <title>Page Design Options</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_10.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <para>This dialog let's you set resources which are usually only resolved
- in runtime. To set a stylesheet, click <emphasis>
- <property>Add</property>
- </emphasis> (for CSS File Path section) and add your stylesheet. It works when
- CSS is defined on your page in the following way:</para>
+ <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>
+ <figure>
+ <title>Page Design Options</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_10.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>Code:</para>
- <programlisting role="XML"><![CDATA[<link rel="stylesheet" type="text/css"
- href="#{facesContext.externalContext.requestContextPath}/style.css"/>
-]]></programlisting>
+ <para>This dialog lets you set resources which are usually only resolved in
+ runtime. Let's look at what functionality it proposes.</para>
- <para>This will work fine in runtime, but the Visual Page Editor doesn't
- know what requestContextPath in design time is.</para>
+ <para>The first two sections of the window let you define actual runtime
+ folders. The example below will help you to clarify how this can be
+ used.</para>
- <para>The next section (URI), let's you add URI taglibs if you are using
- includes so that the editor knows where to find the tag libraries.</para>
+ <para>Suppose you have the following project structure:</para>
- <para>The first two sections let you define actual runtime folders. Here is an
- example.</para>
-
- <para>Let's say you have the following project structure:</para>
-
- <programlisting role="XML"><![CDATA[WebContent/
+ <programlisting role="XML"><![CDATA[WebContent/
pages/
img/
a.gif
header.jsp
main.jsp
-]]></programlisting>
- <para>header.jsp content:</para>
- <programlisting role="XML"><![CDATA[My Header
+ ]]></programlisting>
+
+ <para>The content of the <emphasis>
+ <property>header.jsp</property>
+ </emphasis> is:</para>
+ <programlisting role="XML"><![CDATA[My Header
<img src="img/a.gif"/>
]]></programlisting>
- <para>main.jsp:</para>
- <programlisting role="XML"><![CDATA[<jsp:include page="pages/header.jsp" />
+ <para>and <emphasis>
+ <property>main.jsp</property>
+ </emphasis> content is:</para>
+ <programlisting role="XML"><![CDATA[<jsp:include page="pages/header.jsp" />
]]></programlisting>
- <para> When you open <emphasis>
- <property>main.jsp</property>
- </emphasis> in Visual Page Editor, it will not be able to resolve the image from
- the header, however, it will work fine in runtime. To fix this in design time,
- click the <emphasis>
- <property>Page Design Options</property>
- </emphasis> button and set <emphasis>
- <property>Actual Run-Time Relative</property>
- </emphasis> Folder to <emphasis>
- <property><project>WebContent > pages</property>
- </emphasis> and you will see the image appear.</para>
- <para/>
+ <para> When you open <emphasis>
+ <property>main.jsp</property>
+ </emphasis> in <property>Visual Page Editor</property>, it will not be
+ able to resolve the image from the header, however, it will work fine in
+ runtime. To fix this in design time, click the <emphasis>
+ <property>Page Design Options</property>
+ </emphasis> button and set <emphasis>
+ <property>Actual Run-Time Relative Folder</property>
+ </emphasis> to <emphasis>'projectName > WebContent
+ > pages'</emphasis> and you will see the image
+ appeared.</para>
+ <para/>
- <para>At the bottom of VPE there is a <property>Selection bar</property>.</para>
+ <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> By clicking on the component in Visual view or selecting a code snippet in
- Source mode you see the tags tree. If you want to hide the selection bar, use
- the "Hide Selection Bar" button on the lower right side.</para>
+ <para>Let' consider an example. For instance, the definition of
+ your CSS on the page is the next:</para>
+ <programlisting role="XML"><![CDATA[<link rel="stylesheet" type="text/css"
+ href="#{facesContext.externalContext.requestContextPath}/style.css"/>
+]]></programlisting>
+
+ <para>This will work fine in runtime, but the <property>Visual Page
+ Editor</property> doesn't know what
+ <emphasis>requestContextPath</emphasis> in design time is. In order
+ to see the necessary styles applied in design time your should add a
+ path to your stylesheet in the <property>CSS File Path</property>
+ section.</para>
+
+ <para>The next <property>URI</property> section lets you add URI taglibs so
+ that the editor knows where to find the tag libraries.</para>
+
+ <para>And the last <property>Substituted EL expressions</property> section
+ is provided to specify the values for specific EL variables. It can be
+ useful for a preview generation.</para>
+ <para>As an example look at the figure below:</para>
+ <figure>
+ <title>EL Expression</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_12.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Here bath in Source and Visual modes you see the EL expression
+ <emphasis>#{user.name}</emphasis>. When you switch to
+ <property>Preview view</property>, you'll also see this
+ expression. Now press <emphasis>
+ <property>Page Design Options</property>
+ </emphasis> button and set the value for the
+ <emphasis>#{user.name}</emphasis> as
+ <emphasis><property>World</property>.</emphasis></para>
+
+ <figure>
+ <title>Setting the Value for the EL Expression</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_13.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>As a result in Visual mode and Preview view the word <emphasis>
+ <property>World</property>
+ </emphasis> is displayed.</para>
+ <figure>
+ <title>The EL Expression Value</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_14.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>You can find useful one more functionality provided by VPE. At the bottom of
+ the <property>Visual/Source view</property> there is a <property>Selection Tag
+ Bar</property>. It allows to see tags tree for a current component selected
+ in Visual or Source mode.</para>
+
<figure>
- <title>Selection Bar</title>
+ <title>Selection Tag Bar</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_11.png"/>
+ <imagedata fileref="images/visual_page/visual_page_15.png"/>
</imageobject>
</mediaobject>
</figure>
+
+ <para>If you want to hide the <property>Selection Tag Bar</property>, use the button
+ in the form of a red cross on the lower right side. To reset it again you should
+ check the proper option in the <link linkend="vpe_preferences">VPE
+ Preferences</link>.</para>
</section>
</section>
@@ -1007,7 +1095,7 @@
<title>Preview View</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/visual_page/visual_page_2.png"/>
+ <imagedata fileref="images/visual_page/visual_page_16.png"/>
</imageobject>
</mediaobject>
</figure>
17 years, 4 months
JBoss Tools SVN: r9693 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-08-13 10:00:05 -0400 (Wed, 13 Aug 2008)
New Revision: 9693
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
Log:
Fix JBIDE-2617 issue.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-08-13 13:24:59 UTC (rev 9692)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeResourcesDialogView.java 2008-08-13 14:00:05 UTC (rev 9693)
@@ -96,7 +96,7 @@
if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600);
//changed by estherbin
//http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(700, 600);
+ return new Point(800, 600);
}
}
17 years, 4 months
JBoss Tools SVN: r9692 - tags/jbosstools-3.0.0.Alpha1/documentation.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-08-13 09:24:59 -0400 (Wed, 13 Aug 2008)
New Revision: 9692
Added:
tags/jbosstools-3.0.0.Alpha1/documentation/movies/
Log:
made a copy
Copied: tags/jbosstools-3.0.0.Alpha1/documentation/movies (from rev 9691, trunk/documentation/movies)
17 years, 4 months