JBoss Tools SVN: r6252 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-12 06:13:48 -0500 (Tue, 12 Feb 2008)
New Revision: 6252
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamReferencedFilter.java
Log:
JBIDE-518 Method for determining if component is declared in current project is made public
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamReferencedFilter.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamReferencedFilter.java 2008-02-12 10:23:02 UTC (rev 6251)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamReferencedFilter.java 2008-02-12 11:13:48 UTC (rev 6252)
@@ -40,7 +40,7 @@
return true;
}
- boolean isComponentDeclaredInThisProject(ISeamComponent component) {
+ public static boolean isComponentDeclaredInThisProject(ISeamComponent component) {
Set<ISeamComponentDeclaration> ds = component.getAllDeclarations();
for (ISeamComponentDeclaration d : ds) {
IResource r = d.getResource();
16 years, 4 months
JBoss Tools SVN: r6251 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-12 05:23:02 -0500 (Tue, 12 Feb 2008)
New Revision: 6251
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java
Log:
JBIDE-1764
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2008-02-12 09:46:59 UTC (rev 6250)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ComponentBuilder.java 2008-02-12 10:23:02 UTC (rev 6251)
@@ -124,7 +124,7 @@
ValueInfo factoryName = ValueInfo.getValueInfo(a, null);
if(factoryName == null) {
factoryName = new ValueInfo();
- factoryName.value = m.getName().getIdentifier();
+ factoryName.value = toPropertyName(m.getName().getIdentifier());
factoryName.valueLength = m.getName().getLength();
factoryName.valueStartPosition = m.getName().getStartPosition();
}
@@ -146,6 +146,17 @@
}
}
+ private String toPropertyName(String methodName) {
+ if(methodName == null) {
+ return methodName;
+ }
+ if(methodName.startsWith("get") && methodName.length() > 3) {
+ String root = methodName.substring(3);
+ return root.substring(0, 1).toUpperCase() + root.substring(1);
+ }
+ return methodName;
+ }
+
void processBijections() {
Map<BijectedAttributeType, Annotation> as = new HashMap<BijectedAttributeType, Annotation>();
List<BijectedAttributeType> types = new ArrayList<BijectedAttributeType>();
16 years, 4 months
JBoss Tools SVN: r6250 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-12 04:46:59 -0500 (Tue, 12 Feb 2008)
New Revision: 6250
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
Log:
JBIDE-1670
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-02-12 07:32:53 UTC (rev 6249)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-02-12 09:46:59 UTC (rev 6250)
@@ -13,11 +13,13 @@
import java.net.MalformedURLException;
import java.net.URL;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.internal.commands.ICommandImageService;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.osgi.framework.Bundle;
public class ModelImages {
private static ModelImages instance;
@@ -51,16 +53,27 @@
ICommandImageService s = (ICommandImageService)w.getService(ICommandImageService.class);
return s.getImageDescriptor(key);
}
+ URL url = baseUrl;
+ if(key.startsWith("plugin:")) {
+ key = key.substring("plugin:".length());
+ int i = key.indexOf(":");
+ String plugin = key.substring(0, i);
+ key = key.substring(i + 1);
+ Bundle bundle = Platform.getBundle(plugin);
+ if(bundle != null) {
+ url = bundle.getEntry("/");
+ }
+ }
try {
- return ImageDescriptor.createFromURL(makeIconFileURL(key));
+ return ImageDescriptor.createFromURL(makeIconFileURL(url, key));
} catch (MalformedURLException e) {
return ImageDescriptor.getMissingImageDescriptor();
}
}
- private URL makeIconFileURL(String name) throws MalformedURLException {
+ private URL makeIconFileURL(URL url, String name) throws MalformedURLException {
if (name == null) throw new MalformedURLException("Image name cannot be null.");
- return new URL(baseUrl, name);
+ return new URL(url, name);
}
}
16 years, 4 months
JBoss Tools SVN: r6249 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-02-12 02:32:53 -0500 (Tue, 12 Feb 2008)
New Revision: 6249
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties
Log:
test projects for jst.jsp.test are included in build
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2008-02-11 19:37:10 UTC (rev 6248)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2008-02-12 07:32:53 UTC (rev 6249)
@@ -17,3 +17,4 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.jst.web
Export-Package: org.jboss.tools.jst.jsp.test
+Bundle-ClassPath: jst-jsp-test.jar
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2008-02-11 19:37:10 UTC (rev 6248)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2008-02-12 07:32:53 UTC (rev 6249)
@@ -1,3 +1,4 @@
-source.. = src/
bin.includes = META-INF/,\
- .
+ projects/,\
+ jst-jsp-test.jar
+source.jst-jsp-test.jar = src/
16 years, 4 months
JBoss Tools SVN: r6248 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test: ca and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-11 14:37:10 -0500 (Mon, 11 Feb 2008)
New Revision: 6248
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1766 Create a JUnit TestCase for JBIDE-1759
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-02-11 17:54:28 UTC (rev 6247)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-02-11 19:37:10 UTC (rev 6248)
@@ -4,6 +4,7 @@
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
+import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test;
import org.jboss.tools.jst.jsp.test.ca.StrutsJspJbide1648Test;
import junit.framework.Test;
@@ -13,11 +14,13 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
- suite.addTestSuite(JstJspJbide1585Test.class);
+
+ suite.addTestSuite(JstJspJbide1585Test.class);
suite.addTestSuite(StrutsJspJbide1648Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
+ suite.addTestSuite(JstJspJbide1759Test.class);
return suite;
}
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-02-11 19:37:10 UTC (rev 6248)
@@ -0,0 +1,208 @@
+package org.jboss.tools.jst.jsp.test.ca;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class JstJspJbide1759Test extends TestCase {
+ TestProjectProvider provider = null;
+ IProject project = null;
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "JsfJbide1704Test";
+ private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
+ private static final String INSERT_BEFORE_STRING = "<h:outputText";
+ private static final String INSERTION_BEGIN_STRING = "<h:outputText value=\"";
+ private static final String INSERTION_END_STRING = "\" />";
+ private static final String WHITESPACE_INSERTION_STRING = "";
+
+ public static Test suite() {
+ return new TestSuite(JstJspJbide1759Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ Throwable exception = null;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (Exception x) {
+ exception = x;
+ x.printStackTrace();
+ }
+ assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJstJspJbide1641() {
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+
+ IFile jspFile = project.getFile(PAGE_NAME);
+
+ assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile != null));
+ assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile.exists()));
+
+ FileEditorInput editorInput = new FileEditorInput(jspFile);
+ Throwable exception = null;
+ IEditorPart editorPart = null;
+ try {
+ editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor");
+ } catch (PartInitException ex) {
+ exception = ex;
+ ex.printStackTrace();
+ assertTrue("The JSP Visual Editor couldn't be initialized.", false);
+ }
+
+ JSPMultiPageEditor jspEditor = null;
+
+ if (editorPart instanceof JSPMultiPageEditor)
+ jspEditor = (JSPMultiPageEditor)editorPart;
+
+ // Delay for 3 seconds so that
+ // the Favorites view can be seen.
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue("Waiting for the jobs to complete has failed.", false);
+ }
+ TestUtil.delay(3000);
+
+ JSPTextEditor jspTextEditor = jspEditor.getJspEditor();
+ StructuredTextViewer viewer = jspTextEditor.getTextViewer();
+ IDocument document = viewer.getDocument();
+ SourceViewerConfiguration config = TestUtil.getSourceViewerConfiguration(jspTextEditor);
+ IContentAssistant contentAssistant = (config == null ? null : config.getContentAssistant(viewer));
+
+ assertTrue("Cannot get the Content Assistant instance for the editor for page \"" + PAGE_NAME + "\"", (contentAssistant != null));
+
+ // Find start of <h:outputText> tag
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE_STRING));
+
+ assertTrue("Cannot find the starting point in the test file \"" + PAGE_NAME + "\"", (start != -1));
+
+ // First of all perform the test on a region placed in one space behind empty-valued attribute -
+ // this is to return normal list of attribute names proposal list
+
+ String documentContentModified = documentContent.substring(0, start) +
+ INSERTION_BEGIN_STRING + WHITESPACE_INSERTION_STRING + INSERTION_END_STRING + documentContent.substring(start);
+
+ int offsetToTest = start + INSERTION_BEGIN_STRING.length();
+
+// String visualizeCursorPosition = documentContentModified.substring(0, offsetToTest) +
+// "|" + documentContentModified.substring(offsetToTest);
+
+// System.out.println(visualizeCursorPosition);
+
+ jspTextEditor.setText(documentContentModified);
+
+ ICompletionProposal[] result= null;
+ String errorMessage = null;
+
+ IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
+ if (p != null) {
+ try {
+ result= p.computeCompletionProposals(viewer, offsetToTest);
+ } catch (Throwable x) {
+ x.printStackTrace();
+ }
+ errorMessage= p.getErrorMessage();
+ }
+
+// if (errorMessage != null && errorMessage.trim().length() > 0) {
+// System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage);
+// }
+
+ List<String> customCompletionProposals = new ArrayList<String>();
+ for (int i = 0; i < result.length; i++) {
+ // There should be at least one proposal of type CustomCompletionProposal in the result
+ if (result[i] instanceof CustomCompletionProposal) {
+ customCompletionProposals.add(((CustomCompletionProposal)result[i]).getReplacementString());
+ }
+ }
+ assertFalse("Content Assistant returned no proposals of type CustomCompletionProposal.",customCompletionProposals.isEmpty());
+
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue("Waiting for the jobs to complete has failed.", false);
+ }
+
+ // Next perform the test on a region placed in one space behind an attribute those value is a container
+ // (contains JSF expression) - this has to return the same normal list of attribute names proposal list as
+ // we got at the first step (because the tag is the same, but only the attribute value is changed)
+
+ documentContentModified = documentContent.substring(0, start) +
+ INSERTION_BEGIN_STRING + INSERTION_END_STRING + documentContent.substring(start);
+
+ offsetToTest = start + INSERTION_BEGIN_STRING.length();
+
+// visualizeCursorPosition = documentContentModified.substring(0, offsetToTest) +
+// "|" + documentContentModified.substring(offsetToTest);
+
+// System.out.println(visualizeCursorPosition);
+
+ jspTextEditor.setText(documentContentModified);
+
+ p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
+ if (p != null) {
+ try {
+ result= p.computeCompletionProposals(viewer, offsetToTest);
+ } catch (Throwable x) {
+ x.printStackTrace();
+ }
+ errorMessage= p.getErrorMessage();
+ }
+
+// if (errorMessage != null && errorMessage.trim().length() > 0) {
+// System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage);
+// }
+
+ for (int i = 0; i < result.length; i++) {
+ // There should be the same proposals as in the saved result
+ if (result[i] instanceof CustomCompletionProposal) {
+ assertTrue("Content Assistant returned additional proposal (proposal returned doesn't exist in the saved list).",
+ customCompletionProposals.contains(((CustomCompletionProposal)result[i]).getReplacementString()));
+ customCompletionProposals.remove(((CustomCompletionProposal)result[i]).getReplacementString());
+ }
+ }
+ assertTrue("Content Assistant didn't returned some proposals.",customCompletionProposals.isEmpty());
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeEditor(editorPart, false);
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 4 months
JBoss Tools SVN: r6247 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-11 12:54:28 -0500 (Mon, 11 Feb 2008)
New Revision: 6247
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, popup implemented
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-02-11 17:45:25 UTC (rev 6246)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-02-11 17:54:28 UTC (rev 6247)
@@ -1,6 +1,8 @@
.rich-calendar-input {
cursor:pointer;
- vertical-align:middle;
+ vertical-align: middle;
+ text-align: right;
+
}
.rich-calendar-button {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-02-11 17:45:25 UTC (rev 6246)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-02-11 17:54:28 UTC (rev 6247)
@@ -14,17 +14,21 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Set;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeToggableTemplate;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -39,7 +43,7 @@
* @author dsakovich(a)exadel.com
*
*/
-public class RichFacesCalendarTemplate extends VpeAbstractTemplate {
+public class RichFacesCalendarTemplate extends VpeAbstractTemplate implements VpeToggableTemplate {
static String[] HEADER_CONTENT = { "<<", "<", "", ">", ">>" };
final static int MONTH_LENGTH[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31,
@@ -59,14 +63,15 @@
final static int CALENDAR_INPUT_WIDTH = CALENDAR_WIDTH - 20;
final static int CALENDAR_IMAGE_WIDTH = 20;
final static int CALENDAR_CUSTOM_IMAGE_WIDTH = 40;
- final static int CALENDAR_BUTTON_WIDTH = 100;
+ final static int CALENDAR_BUTTON_WIDTH = 80;
final static String ATTRIBUTE_TEXT = "text";
static final String DEFAULT_DATE_PATTERN = "MMMM, yyyy";
static final String HEADER = "header";
static final String FOOTER = "footer";
+ static final String VPE_USER_TOGGLE_ID_ATTR = "vpe-user-toggle-id";
- /*Attributes*/
+ /*rich:calendar attributes*/
static final String BUTTON_LABEL = "buttonLabel";
static final String BUTTON_ICON = "buttonIcon";
static final String DIRECTION = "direction";
@@ -84,13 +89,9 @@
static final String SHOW_SHOW_WEEKS_DAY_BAR = "showWeekDaysBar";
static final String SHOW_WEEKS_BAR = "showWeeksBar";
static final String TODAY_CONTROL_MODE = "todayControlMode";
+ static final String SHOW_HEADER = "showHeader";
+ static final String SHOW_FOOTER= "showFooter";
- /*Attribute values*/
- static final String DIRECTIONS_TOP_LEFT = "top-left";
- static final String DIRECTIONS_TOP_RIGHT = "top-right";
- static final String DIRECTIONS_BOTTOM_LEFT = "bottom-left";
- static final String DIRECTIONS_BOTTOM_RIGHT = "top-right";
-
/*CSS classes*/
static final String CSS_R_C_INPUT = "rich-calendar-input";
static final String CSS_R_C_BUTTON = "rich-calendar-button";
@@ -115,14 +116,32 @@
static final String CSS_R_C_HEADER_OPTIONAL = "rich-calendar-header-optional";
static final String CSS_R_C_FOOTER_OPTIONAL = "rich-calendar-footer-optional";
- final static String WEEK_DAY_HTML_CLASS_ATTR = CSS_R_C_DAYS;
- final static String HOL_WEEK_DAY_HTML_CLASS_ATTR = CSS_R_C_DAYS + " " + CSS_R_C_WEEKENDS;
- final static String TODAY_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_TODAY;
- final static String CUR_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL;
- final static String HOL_CUR_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_HOLLY;
- final static String OTHER_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_BOUNDARY_DATES;
- final static String HOL_OTHER_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_HOLLY + " " + CSS_R_C_BOUNDARY_DATES ;
+ private final static String WEEK_DAY_HTML_CLASS_ATTR = CSS_R_C_DAYS;
+ private final static String HOL_WEEK_DAY_HTML_CLASS_ATTR = CSS_R_C_DAYS + " " + CSS_R_C_WEEKENDS;
+ private final static String TODAY_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_TODAY;
+ private final static String CUR_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL;
+ private final static String HOL_CUR_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_HOLLY;
+ private final static String OTHER_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_BOUNDARY_DATES;
+ private final static String HOL_OTHER_MONTH_HTML_CLASS_ATTR = CSS_R_C_CELL_SIZE + " "+ CSS_R_C_CELL + " "+ CSS_R_C_HOLLY + " " + CSS_R_C_BOUNDARY_DATES ;
+ /*Attribute values*/
+ private static final String DIRECTIONS_TOP_LEFT = "top-left";
+ private static final String DIRECTIONS_TOP_RIGHT = "top-right";
+ private static final String DIRECTIONS_BOTTOM_LEFT = "bottom-left";
+ private static final String DIRECTIONS_BOTTOM_RIGHT = "bottom-right";
+ private static final int DIRECTIONS_TOP_LEFT_INT = 1;
+ private static final int DIRECTIONS_TOP_RIGHT_INT = 2;
+ private static final int DIRECTIONS_BOTTOM_LEFT_INT = 3;
+ private static final int DIRECTIONS_BOTTOM_RIGHT_INT = 4;
+
+ /*styles for direction table cells*/
+ private static final String STYLE_TOP_LEFT = "vertical-align: bottom; text-align: right;";
+ private static final String STYLE_TOP_RIGHT = "vertical-align: bottom; text-align: left;";
+ private static final String STYLE_BOTTOM_LEFT = "vertical-align: top; text-align: right;";
+ private static final String STYLE_BOTTOM_RIGHT = "vertical-align: top; text-align: left;";
+ private static final String CALENDAR_POSITION_STYLE = "position: absolute; z-index: 10;";
+
+ /*rich:calendar attributes*/
private String buttonLabel;
private String buttonIcon;
private String direction;
@@ -140,18 +159,21 @@
private String showWeekDaysBar;
private String showWeeksBar;
private String todayControlMode;
+ private String showHeader;
+ private String showFooter;
private List<String> holidays = new ArrayList<String>();
private String[] weeks = new String[7];
- static Set<String> directions;
+ static Map<String, Integer> directions;
+ private boolean showPopupCalendar = false;
public RichFacesCalendarTemplate() {
super();
- directions = new HashSet<String>(4);
- directions.add(DIRECTIONS_TOP_LEFT);
- directions.add(DIRECTIONS_TOP_RIGHT);
- directions.add(DIRECTIONS_BOTTOM_LEFT);
- directions.add(DIRECTIONS_BOTTOM_RIGHT);
+ directions = new HashMap<String, Integer>(4);
+ directions.put(DIRECTIONS_TOP_LEFT, DIRECTIONS_TOP_LEFT_INT);
+ directions.put(DIRECTIONS_TOP_RIGHT, DIRECTIONS_TOP_RIGHT_INT);
+ directions.put(DIRECTIONS_BOTTOM_LEFT, DIRECTIONS_BOTTOM_LEFT_INT);
+ directions.put(DIRECTIONS_BOTTOM_RIGHT, DIRECTIONS_BOTTOM_RIGHT_INT);
}
@@ -179,21 +201,108 @@
nsIDOMElement div = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
VpeCreationData creationData = new VpeCreationData(div);
- if (popup != null && popup.equalsIgnoreCase("false")) {
- nsIDOMElement calendar;
+ nsIDOMElement calendar;
+ nsIDOMElement calendarWithPopup;
+ if ("false".equalsIgnoreCase(popup)) {
if ("true".equalsIgnoreCase(disabled)) {
calendar = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
} else {
calendar = createCalendar(visualDocument, creationData, source);
}
- //creationData = new VpeCreationData(calendar);
div.appendChild(calendar);
} else {
- nsIDOMElement calendarWithPopup = createCalendarWithPopup(
- visualDocument, source);
- //creationData = new VpeCreationData(calendarWithPopup);
- div.appendChild(calendarWithPopup);
+ calendarWithPopup = createCalendarWithPopup(visualDocument, source);
+ calendar = createCalendar(visualDocument, creationData, source);
+
+ calendar.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, CALENDAR_POSITION_STYLE);
+
+ if (showPopupCalendar) {
+ if (attrPresents(direction) && directions.keySet().contains(direction)) {
+ nsIDOMElement table = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ nsIDOMElement top_tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement bottom_tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement top_left_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement top_right_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement bottom_left_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement bottom_right_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+
+ top_tr.appendChild(top_left_td);
+ top_tr.appendChild(top_right_td);
+ bottom_tr.appendChild(bottom_left_td);
+ bottom_tr.appendChild(bottom_right_td);
+ table.appendChild(top_tr);
+ table.appendChild(bottom_tr);
+ div.appendChild(table);
+
+ top_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_LEFT);
+ top_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_RIGHT);
+ bottom_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_LEFT);
+ bottom_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_RIGHT);
+
+ switch (directions.get(direction)) {
+ case DIRECTIONS_BOTTOM_RIGHT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ bottom_right_td.appendChild(calendar);
+ break;
+ case DIRECTIONS_BOTTOM_LEFT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ bottom_left_td.appendChild(calendar);
+ break;
+ case DIRECTIONS_TOP_RIGHT_INT:
+ top_right_td.appendChild(calendar);
+ top_right_td.appendChild(calendarWithPopup);
+ break;
+ case DIRECTIONS_TOP_LEFT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ top_left_td.appendChild(calendar);
+ break;
+ default:
+ break;
+ }
+
+ } else {
+ // no direction. simple display.
+ calendar.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, CALENDAR_POSITION_STYLE);
+ div.appendChild(calendarWithPopup);
+ div.appendChild(calendar);
+ }
+
+ } else {
+ // display input field with button
+ div.appendChild(calendarWithPopup);
+ // hide unparsed facets
+ nsIDOMElement hiddenDiv = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ hiddenDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
+ HtmlComponentUtil.HTML_ATR_WIDTH + " : " + CALENDAR_WIDTH
+ + "px; overflow: hidden; display: none;");
+
+ nsIDOMElement hiddenTable = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+
+ Element headerFacet = ComponentUtil.getFacet(source, HEADER);
+ nsIDOMElement optionalHeader = null;
+ if (null != headerFacet) {
+ optionalHeader = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, headerFacet, true);
+ hiddenTable.appendChild(optionalHeader);
+ }
+ Element footerFacet = ComponentUtil.getFacet(source, FOOTER);
+ nsIDOMElement optionalFooter = null;
+ if (null != footerFacet) {
+ optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
+ hiddenTable.appendChild(optionalFooter);
+ }
+ hiddenDiv.appendChild(hiddenTable);
+ }
+
}
return creationData;
}
@@ -204,85 +313,93 @@
* @return Node of the visual tree.
*/
private nsIDOMElement createCalendarWithPopup(
- nsIDOMDocument visualDocument, Element source) {
+ nsIDOMDocument visualDocument, Element source) {
nsIDOMElement table = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- nsIDOMElement tr = visualDocument
+
+ nsIDOMElement tr1 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TR);
- nsIDOMElement td1 = visualDocument
+ nsIDOMElement td1_1 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
- nsIDOMElement td2 = visualDocument
+ nsIDOMElement td1_2 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
-
+
+ nsIDOMElement tr2 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement td2_1 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+
+
table.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
HtmlComponentUtil.HTML_ATR_WIDTH + " : 100%");
-
- tr.appendChild(td1);
- tr.appendChild(td2);
- table.appendChild(tr);
-
- nsIDOMElement div = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
- int divWidth = CALENDAR_WIDTH + CALENDAR_IMAGE_WIDTH;
- div.appendChild(table);
-
- if (!"false".equalsIgnoreCase(showInput)) {
- nsIDOMElement input = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_INPUT);
- input.setAttribute(HtmlComponentUtil.HTML_TYPE_ATTR, ATTRIBUTE_TEXT);
- input.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_R_C_INPUT);
- input.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- HtmlComponentUtil.HTML_ATR_WIDTH + " : "
- + CALENDAR_INPUT_WIDTH + "px;");
-
- if ("true".equals(enableManualInput)) {
- input.setAttribute(HtmlComponentUtil.HTML_READONLY_ATTR, "true");
- }
- if ("true".equals(disabled)) {
- input.setAttribute(HtmlComponentUtil.HTML_ATTR_DISABLED, "true");
- }
- if (attrPresents(datePattern)) {
- input.setAttribute(HtmlComponentUtil.HTML_VALUE_ATTR, datePattern);
- }
- td1.appendChild(input);
- //div.appendChild(input);
- }
-
+ tr1.appendChild(td1_1);
+ tr1.appendChild(td1_2);
+ table.appendChild(tr1);
- if (attrPresents(buttonLabel)) {
- nsIDOMElement button = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_INPUT);
- button.setAttribute(HtmlComponentUtil.HTML_TYPE_ATTR,
- HtmlComponentUtil.HTML_TAG_BUTTON);
- button.setAttribute(HtmlComponentUtil.HTML_VALUE_ATTR, buttonLabel);
- button.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_R_C_BUTTON);
- if ("true".equalsIgnoreCase(disabled)) {
- button.setAttribute(HtmlComponentUtil.HTML_ATTR_DISABLED, "true");
- }
-
- td2.appendChild(button);
- divWidth = CALENDAR_WIDTH + CALENDAR_BUTTON_WIDTH;
- //div.appendChild(button);
- } else {
- nsIDOMElement image = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_IMG);
- image.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_BUTTON);
- if (attrPresents(buttonIcon)) {
- image.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, buttonIcon);
- divWidth = CALENDAR_WIDTH + CALENDAR_CUSTOM_IMAGE_WIDTH;
- } else {
- ComponentUtil.setImg(image, BUTTON_IMG);
- divWidth = CALENDAR_WIDTH + CALENDAR_IMAGE_WIDTH;
- }
- td2.appendChild(image);
- //div.appendChild(image);
- }
- div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- HtmlComponentUtil.HTML_ATR_WIDTH + " : "
- + divWidth + "px; overflow: hidden;");
- return div;
+ tr2.appendChild(td2_1);
+ table.appendChild(tr2);
+
+ nsIDOMElement div = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ int divWidth = CALENDAR_WIDTH + CALENDAR_IMAGE_WIDTH;
+ div.appendChild(table);
+
+ if (!"false".equalsIgnoreCase(showInput)) {
+ nsIDOMElement input = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_INPUT);
+ input.setAttribute(HtmlComponentUtil.HTML_TYPE_ATTR, ATTRIBUTE_TEXT);
+ input.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_R_C_INPUT);
+ input.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
+ HtmlComponentUtil.HTML_ATR_WIDTH + " : "
+ + CALENDAR_INPUT_WIDTH + "px;");
+
+ if ("true".equals(enableManualInput)) {
+ input.setAttribute(HtmlComponentUtil.HTML_READONLY_ATTR, "true");
+ }
+ if ("true".equals(disabled)) {
+ input.setAttribute(HtmlComponentUtil.HTML_ATTR_DISABLED, "true");
+ }
+
+ if (attrPresents(datePattern)) {
+ input.setAttribute(HtmlComponentUtil.HTML_VALUE_ATTR, datePattern);
+ }
+ td1_1.appendChild(input);
+ }
+
+
+ if (attrPresents(buttonLabel)) {
+ nsIDOMElement button = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_INPUT);
+ button.setAttribute(HtmlComponentUtil.HTML_TYPE_ATTR,
+ HtmlComponentUtil.HTML_TAG_BUTTON);
+ button.setAttribute(HtmlComponentUtil.HTML_VALUE_ATTR, buttonLabel);
+ button.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_R_C_BUTTON);
+ if ("true".equalsIgnoreCase(disabled)) {
+ button.setAttribute(HtmlComponentUtil.HTML_ATTR_DISABLED, "true");
+ }
+ button.setAttribute(VPE_USER_TOGGLE_ID_ATTR, ""+showPopupCalendar);
+ td1_2.appendChild(button);
+ divWidth = CALENDAR_WIDTH + CALENDAR_BUTTON_WIDTH;
+ } else {
+ nsIDOMElement image = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_IMG);
+ image.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_BUTTON);
+ if (attrPresents(buttonIcon)) {
+ image.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, buttonIcon);
+ divWidth = CALENDAR_WIDTH + CALENDAR_CUSTOM_IMAGE_WIDTH;
+ } else {
+ ComponentUtil.setImg(image, BUTTON_IMG);
+ divWidth = CALENDAR_WIDTH + CALENDAR_IMAGE_WIDTH;
+ }
+ image.setAttribute(VPE_USER_TOGGLE_ID_ATTR, ""+showPopupCalendar);
+ td1_2.appendChild(image);
+ }
+ div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
+ HtmlComponentUtil.HTML_ATR_WIDTH + " : "
+ + divWidth + "px; overflow: hidden;");
+ return div;
}
/**
@@ -350,15 +467,27 @@
if (null != footerFacet) {
optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
}
-
- nsIDOMElement header = createCalendarHeader(visualDocument);
+ nsIDOMElement header = null;
nsIDOMElement calendarBody = createCalendarBody(visualDocument);
+ nsIDOMElement footer = null;
+ if (!"false".equals(showHeader)) {
+ header = createCalendarHeader(visualDocument);
+ }
+ if (!"false".equals(showFooter)) {
+ footer = createCalendarFooter(visualDocument);
+ }
+
if (null != optionalHeader) {
tbody.appendChild(optionalHeader);
}
- tbody.appendChild(header);
+ if (null != header) {
+ tbody.appendChild(header);
+ }
tbody.appendChild(calendarBody);
+ if (null != footer) {
+ tbody.appendChild(footer);
+ }
if (null != optionalFooter) {
tbody.appendChild(optionalFooter);
}
@@ -366,8 +495,7 @@
table.appendChild(tbody);
div.appendChild(table);
- //return div;
- return table;
+ return div;
}
private nsIDOMElement createCalendarOptionalHeaderOrFooter(
@@ -450,7 +578,81 @@
tr.appendChild(td);
return tr;
}
+
+ private nsIDOMElement createCalendarFooter(nsIDOMDocument visualDocument) {
+ // Footer for calendar
+ nsIDOMElement tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+
+ nsIDOMElement td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, "" + COLUMN);
+
+ nsIDOMElement table = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
+
+ nsIDOMElement tr1 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+
+ nsIDOMElement td1 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_TOOLFOOTER);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
+ Calendar cal = getCalendarWithLocale();
+
+ nsIDOMText text1 = visualDocument.createTextNode(sdf.format(cal
+ .getTime()));
+ td1.appendChild(text1);
+ tr1.appendChild(td1);
+
+ nsIDOMElement td2 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td2.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
+ td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_TOOLFOOTER);
+ tr1.appendChild(td2);
+
+ nsIDOMElement td3 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td3.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
+ td3.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_TOOLFOOTER);
+ td3.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR,
+ HtmlComponentUtil.HTML_ALIGN_RIGHT_VALUE);
+
+ String nodeText;
+ if ("false".equalsIgnoreCase(showApplyButton)) {
+ if ("hidden".equalsIgnoreCase(todayControlMode)) {
+ nodeText = "";
+ } else {
+ nodeText = TODAY;
+ }
+ } else {
+ if ("hidden".equalsIgnoreCase(todayControlMode)) {
+ nodeText = APPLY;
+ } else {
+ nodeText = TODAY + VERTICAL_SEPARATOR + APPLY;
+ }
+ }
+ nsIDOMText text3 = visualDocument.createTextNode(nodeText);
+
+ td3.appendChild(text3);
+ tr1.appendChild(td3);
+
+ table.appendChild(tr1);
+ td.appendChild(table);
+ tr.appendChild(td);
+
+ return tr;
+ }
+
/**
*
* @param visualDocument
@@ -595,80 +797,6 @@
}
tbody.appendChild(tr);
}
-
- // Footer for calendar
-
- nsIDOMElement tr = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
-
- nsIDOMElement td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, "" + COLUMN);
-
- nsIDOMElement table = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
-
- nsIDOMElement tr1 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
-
- nsIDOMElement td1 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_TOOLFOOTER);
-
- SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
-// cal = Calendar.getInstance();
- cal = getCalendarWithLocale();
-
- nsIDOMText text1 = visualDocument.createTextNode(sdf.format(cal
- .getTime()));
- td1.appendChild(text1);
- tr1.appendChild(td1);
-
- nsIDOMElement td2 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td2.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
- td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_TOOLFOOTER);
- tr1.appendChild(td2);
-
- nsIDOMElement td3 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td3.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
- td3.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_TOOLFOOTER);
- td3.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR,
- HtmlComponentUtil.HTML_ALIGN_RIGHT_VALUE);
-
- String nodeText;
- if ("false".equalsIgnoreCase(showApplyButton)) {
- if ("hidden".equalsIgnoreCase(todayControlMode)) {
- nodeText = "";
- } else {
- nodeText = TODAY;
- }
- } else {
- if ("hidden".equalsIgnoreCase(todayControlMode)) {
- nodeText = APPLY;
- } else {
- nodeText = TODAY + VERTICAL_SEPARATOR + APPLY;
- }
- }
- nsIDOMText text3 = visualDocument.createTextNode(nodeText);
-
- td3.appendChild(text3);
- tr1.appendChild(td3);
-
- table.appendChild(tr1);
- td.appendChild(table);
- tr.appendChild(td);
-
- tbody.appendChild(tr);
-
return tbody;
}
@@ -736,16 +864,17 @@
showWeekDaysBar = source.getAttribute(SHOW_SHOW_WEEKS_DAY_BAR);
showWeeksBar = source.getAttribute(SHOW_WEEKS_BAR);
todayControlMode = source.getAttribute(TODAY_CONTROL_MODE);
+ showHeader = source.getAttribute(SHOW_HEADER);
+ showFooter = source.getAttribute(SHOW_FOOTER);
}
private boolean attrPresents(String attr) {
- return ((null != attr) && (!"".equals(attr)));
- }
-
- private void initCalendar() {
-// Calendar cal = Calendar.getInstance();
+ return ((null != attr) && (!"".equals(attr)));
+ }
+
+ private void initCalendar() {
Calendar cal = getCalendarWithLocale();
-
+
int firstDayOfWeek = cal.getFirstDayOfWeek();
while (firstDayOfWeek != cal.get(Calendar.DAY_OF_WEEK)) {
cal.add(Calendar.DAY_OF_MONTH, 1);
@@ -761,9 +890,9 @@
holidays.add(dayOfWeek);
cal.add(Calendar.DAY_OF_MONTH, 1);
}
- }
-
- private Calendar getCalendarWithLocale() {
+ }
+
+ private Calendar getCalendarWithLocale() {
Locale customLocale;
if (attrPresents(this.locale)) {
customLocale = parseLocale(locale);
@@ -772,33 +901,40 @@
return Calendar.getInstance();
}
-public Locale parseLocale(String localeStr){
-
+ public Locale parseLocale(String localeStr) {
int length = localeStr.length();
- if(null==localeStr||length<2){
+ if (null == localeStr || length < 2) {
return Locale.getDefault();
}
-
- //Lookup index of first '_' in string locale representation.
+ // Lookup index of first '_' in string locale representation.
int index1 = localeStr.indexOf("_");
- //Get first charters (if exist) from string
- String language = null;
- if(index1!=-1){
+ // Get first charters (if exist) from string
+ String language = null;
+ if (index1 != -1) {
language = localeStr.substring(0, index1);
- }else{
+ } else {
return new Locale(localeStr);
}
- //Lookup index of second '_' in string locale representation.
- int index2 = localeStr.indexOf("_", index1+1);
+ // Lookup index of second '_' in string locale representation.
+ int index2 = localeStr.indexOf("_", index1 + 1);
String country = null;
- if(index2!=-1){
- country = localeStr.substring(index1+1, index2);
- String variant = localeStr.substring(index2+1);
+ if (index2 != -1) {
+ country = localeStr.substring(index1 + 1, index2);
+ String variant = localeStr.substring(index2 + 1);
return new Locale(language, country, variant);
- }else{
- country = localeStr.substring(index1+1);
+ } else {
+ country = localeStr.substring(index1 + 1);
return new Locale(language, country);
- }
+ }
}
+
+ public void stopToggling(Node sourceNode) {
+ }
+ public void toggle(VpeVisualDomBuilder builder, Node sourceNode,
+ String toggleId) {
+ showPopupCalendar = !showPopupCalendar;
+// showPopupCalendar = (showPopupCalendar ? false : true);
+ }
+
}
16 years, 4 months
JBoss Tools SVN: r6246 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-11 12:45:25 -0500 (Mon, 11 Feb 2008)
New Revision: 6246
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1771 OpenOn for xsi:schemaLocation attribute value doesn't work in faces-config.xml.
fixed for JSF 1.1
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-02-11 17:41:15 UTC (rev 6245)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-02-11 17:45:25 UTC (rev 6246)
@@ -274,7 +274,7 @@
mappedSystemId = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolvePublic(publicId, systemId);
if (mappedSystemId == null)
mappedSystemId = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveSystem(systemId);
- if (systemId != null)
+ if (mappedSystemId == null && systemId != null)
mappedSystemId = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveURI(systemId);
} catch (Exception e) {
// Ignore, just return null as result
16 years, 4 months
JBoss Tools SVN: r6245 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/788 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-02-11 12:41:15 -0500 (Mon, 11 Feb 2008)
New Revision: 6245
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/TestChangeUriInInnerNodes.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforHtml.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforJSP.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforXHTML.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
base tests for CA, http://jira.jboss.com/jira/browse/JBIDE-788
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/TestChangeUriInInnerNodes.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/TestChangeUriInInnerNodes.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/TestChangeUriInInnerNodes.xhtml 2008-02-11 17:41:15 UTC (rev 6245)
@@ -0,0 +1,15 @@
+<!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:rich="http://richfaces.org/rich"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:a4j="http://richfaces.org/a4j">
+<head>
+ XHTML TEST Page
+</head>
+<body>
+<s:button value="Submit"></s:button>
+<div xmlns:rich="http://jboss.com/products/seam/taglib">
+ <rich:button value="Submit"></rich:button>
+</div>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforHtml.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforHtml.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforHtml.html 2008-02-11 17:41:15 UTC (rev 6245)
@@ -0,0 +1,7 @@
+<html>
+<head>
+</head>
+<body>
+ Test
+</body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforJSP.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforJSP.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforJSP.jsp 2008-02-11 17:41:15 UTC (rev 6245)
@@ -0,0 +1,25 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/standard/scriptfree" prefix="scriptfree" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/standard/permittedTaglibs" prefix="permittedTaglibs" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jstl/sql" prefix="sql" %>
+<%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <H1> CA Test Page </H1> Test
+
+ <h:outputText value="Test" />
+ </f:view>
+ </body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforXHTML.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforXHTML.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAforXHTML.xhtml 2008-02-11 17:41:15 UTC (rev 6245)
@@ -0,0 +1,22 @@
+<!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:h="http://java.sun.com/jsf/html"
+xmlns:f="http://java.sun.com/jsf/core"
+xmlns:scriptfree="http://jakarta.apache.org/taglibs/standard/scriptfree"
+xmlns:permittedTaglibs="http://jakarta.apache.org/taglibs/standard/permittedTaglibs"
+xmlns:sql="http://java.sun.com/jsp/jstl/sql"
+xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+xmlns:c="http://java.sun.com/jsp/jstl/core"
+xmlns:x="http://java.sun.com/jsp/jstl/xml" >
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <H1>Test of CA XHTML</H1>
+ CA Test
+ <h:outputText value="Test" />
+ </f:view>
+ </body>
+</html>
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-02-11 16:40:49 UTC (rev 6244)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-02-11 17:41:15 UTC (rev 6245)
@@ -19,6 +19,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1479Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
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.JsfJbide1548Test;
@@ -47,6 +48,7 @@
suite.addTestSuite(JsfJbide1568Test.class);
suite.addTestSuite(JBIDE1615Test.class);
suite.addTestSuite(JBIDE1479Test.class);
+ suite.addTestSuite(JBIDE788Test.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/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-02-11 17:41:15 UTC (rev 6245)
@@ -0,0 +1,127 @@
+/*******************************************************************************
+* Copyright (c) 2007 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
+*
+* Contributors:
+* Red Hat, Inc. - initial API and implementation
+******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * @author Max Areshkau
+ *
+ * JUnit test for http://jira.jboss.com/jira/browse/JBIDE-788
+ */
+public class JBIDE788Test extends VpeTest{
+
+ private static final String IMPORT_PROJECT_NAME = "jsfTest";
+
+ public JBIDE788Test(String name) {
+ super(name);
+ }
+ /**
+ * Tests CA on html files
+ * @throws Throwable
+ */
+ public void testCAforHtmlFiles() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ //Tests CA
+ baseCheckofCA("org.eclipse.wst.html.HTML_DEFAULT", "JBIDE/788/testCAforHtml.html", 32, 79);
+
+ // check exception
+ if (getException() != null) {
+
+ throw getException();
+ }
+ }
+ /**
+ * Tests CA on jsp files
+ * @throws Throwable
+ */
+ public void testCAforJSPFiles() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ //Tests CA
+ baseCheckofCA("org.eclipse.wst.html.HTML_DEFAULT", "JBIDE/788/testCAforJSP.jsp", 1000, 110);
+ // check exception
+ if (getException() != null) {
+
+ throw getException();
+ }
+ }
+ /**
+ * Tests CA on jsp files
+ * @throws Throwable
+ */
+ public void testCAforXHTMLFiles() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ //Tests CA
+ baseCheckofCA("org.eclipse.wst.html.HTML_DEFAULT", "JBIDE/788/testCAforXHTML.xhtml", 745, 96);
+ // check exception
+ if (getException() != null) {
+
+ throw getException();
+ }
+ }
+ /**
+ * Perfoms base test of ca, compare number of proposals which what returned by ca
+ * with etalon
+ * @param caName - content assistent name
+ * @param testPagePath - test page
+ * @param position - position on test page
+ * @param numberOfProposals - standard number of proposals
+ * @throws CoreException
+ */
+ private void baseCheckofCA(String caName,String testPagePath, int position, int numberOfProposals) throws CoreException {
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+ TestUtil.waitForJobs();
+ TestUtil.delay(2000);
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor)part.getSourceEditor()).getSourceViewerConfigurationForTest();
+
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc.getContentAssistant((ISourceViewer) part.getSourceEditor().getAdapter(ISourceViewer.class));
+ assertNotNull(iContentAssistant);
+ IContentAssistProcessor iContentAssistProcessor= iContentAssistant.getContentAssistProcessor(caName);
+ assertNotNull(iContentAssistProcessor);
+ ICompletionProposal[] results = iContentAssistProcessor.computeCompletionProposals(part.getSourceEditor().getTextViewer(), position);
+ assertNotNull(results);
+ assertEquals(numberOfProposals,results.length);
+ }
+}
16 years, 4 months
JBoss Tools SVN: r6244 - trunk/jbpm/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-11 11:40:49 -0500 (Mon, 11 Feb 2008)
New Revision: 6244
Modified:
trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-155 - adding the note
Modified: trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-02-11 16:37:36 UTC (rev 6243)
+++ trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-02-11 16:40:49 UTC (rev 6244)
@@ -15,9 +15,13 @@
jBPM</property> (business process management).</para>
<para>The jBPM plugin (jBPM Designer) is already included in the <property>JBoss Tools</property>.
To make it work, you should only download the jBPM runtime (<ulink
- url="http://labs.jboss.com/jbossjbpm/downloads/">jbpm-jpdl-3.2.2</ulink> currently) and specify the
- directory where you extracted the runtime either when you create a jBPM project or by using the
- jBPM preference pages.</para>
+ url="http://labs.jboss.com/jbossjbpm/downloads/">jbpm-jpdl-3.2.2</ulink> currently) and specify
+ the directory where you extracted the runtime either when you create a jBPM project or by using
+ the jBPM preference pages.</para>
+
+ <note><para>Try to avoid using spaces in the names of installation folders. It can provoke problems in
+ some situations with Sun-based VMs.</para></note>
+
<para>Navigate to <emphasis>
<property>Window > Preferences > JBoss jBPM > Runtime Locations</property>
</emphasis>. Here you can add, edit and remove JBoss jBPM installation locations. Click <emphasis>
16 years, 4 months
JBoss Tools SVN: r6243 - in trunk/jbpm/docs/reference/en/images: Test_Drive_Proc and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-11 11:37:36 -0500 (Mon, 11 Feb 2008)
New Revision: 6243
Modified:
trunk/jbpm/docs/reference/en/images/Quick_Howto_Guide/quick_howto_guide_2.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2_b.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour6.png
trunk/jbpm/docs/reference/en/images/the_views/the_views.png
Log:
http://jira.jboss.com/jira/browse/JBDS-155 - replacing red ball icon in the left top coner of the screenshots
Modified: trunk/jbpm/docs/reference/en/images/Quick_Howto_Guide/quick_howto_guide_2.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2_b.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour6.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views.png
===================================================================
(Binary files differ)
16 years, 4 months