JBoss Tools SVN: r16213 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-25 19:34:04 -0400 (Thu, 25 Jun 2009)
New Revision: 16213
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 23:02:44 UTC (rev 16212)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 23:34:04 UTC (rev 16213)
@@ -19,9 +19,6 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -47,7 +44,7 @@
return EMPTY_PROPOSAL_LIST;
}
Properties view = new Properties();
- view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getFullPath());
+ view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getFullPath().removeFirstSegments(1).toString());
List<Object> sourceList = provider.getList(xModel, WebPromptingProvider.JSF_VIEW_ACTIONS, "", view);
if (sourceList != null && !sourceList.isEmpty()) {
Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 23:02:44 UTC (rev 16212)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 23:34:04 UTC (rev 16213)
@@ -23,8 +23,6 @@
*/
public class CustomTagLibAttribute extends AbstractAttribute {
- private final static String ENUMERATION_TYPE = "enumeration"; //$NON-NLS-1$
-
protected boolean extended = true;
protected String defaultValue;
protected CustomProposalType[] proposals;
15 years, 6 months
JBoss Tools SVN: r16212 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-25 19:02:44 -0400 (Thu, 25 Jun 2009)
New Revision: 16212
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 21:51:46 UTC (rev 16211)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 23:02:44 UTC (rev 16212)
@@ -19,6 +19,9 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -44,7 +47,7 @@
return EMPTY_PROPOSAL_LIST;
}
Properties view = new Properties();
- view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getLocation());
+ view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getFullPath());
List<Object> sourceList = provider.getList(xModel, WebPromptingProvider.JSF_VIEW_ACTIONS, "", view);
if (sourceList != null && !sourceList.isEmpty()) {
Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 21:51:46 UTC (rev 16211)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 23:02:44 UTC (rev 16212)
@@ -69,6 +69,9 @@
@Override
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
CustomProposalType[] types = getProposals();
+ if(types.length==0) {
+ return EMPTY_PROPOSAL_LIST;
+ }
if(types.length==1) {
return types[0].getProposals(query, context);
}
15 years, 6 months
JBoss Tools SVN: r16211 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal/taglib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-25 17:51:46 -0400 (Thu, 25 Jun 2009)
New Revision: 16211
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-25 21:23:26 UTC (rev 16210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-25 21:51:46 UTC (rev 16211)
@@ -67,6 +67,10 @@
attrbMap.put(att.getName(), att);
}
}
+ IAttribute[] attrs = getAttributes(query, context, false);
+ for (int i = 0; i < attrs.length; i++) {
+ attrbMap.put(attrs[i].getName(), attrs[i]);
+ }
for (int i = 0; i < componentExtensions.length; i++) {
if(attrbMap.containsKey(componentExtensions[i].getName())) {
TextProposal[] attProposals = componentExtensions[i].getProposals(query, context);
@@ -84,7 +88,6 @@
}
} else {
String value = query.getValue();
- //TODO convert value to EL string.
String elString = value;
ELResolver[] resolvers = context.getElResolvers();
for (int i = 0; resolvers != null && i < resolvers.length; i++) {
@@ -121,16 +124,16 @@
for (int i = 0; i < libs.length; i++) {
IComponent[] libComponents = libs[i].getComponents(query, context);
for (int j = 0; j < libComponents.length; j++) {
- if(includeComponentExtensions || !libComponents[i].isExtended()) {
- components.add(libComponents[i]);
+ if(includeComponentExtensions || !libComponents[j].isExtended()) {
+ components.add(libComponents[j]);
}
}
}
for (int i = 0; customTagLibs != null && i < customTagLibs.length; i++) {
IComponent[] libComponents = customTagLibs[i].getComponents(query, context);
for (int j = 0; j < libComponents.length; j++) {
- if(includeComponentExtensions || !libComponents[i].isExtended()) {
- components.add(libComponents[i]);
+ if(includeComponentExtensions || !libComponents[j].isExtended()) {
+ components.add(libComponents[j]);
}
}
}
@@ -146,20 +149,26 @@
* @return attributes
*/
public IAttribute[] getAttributes(KbQuery query, IPageContext context) {
+ return getAttributes(query, context, true);
+ }
+
+ private IAttribute[] getAttributes(KbQuery query, IPageContext context, boolean includeComponentExtensions) {
if(query.getType() == KbQuery.Type.ATTRIBUTE_NAME || query.getType() == KbQuery.Type.ATTRIBUTE_VALUE) {
ArrayList<IAttribute> attributes = new ArrayList<IAttribute>();
Map<String, IAttribute> attrbMap = new HashMap<String, IAttribute>();
- IComponent[] components = getComponents(query, context, true);
+ IComponent[] components = getComponents(query, context, includeComponentExtensions);
for (int i = 0; i < components.length; i++) {
IAttribute[] libAttributess = components[i].getAttributes(query, context);
for (int j = 0; j < libAttributess.length; j++) {
- attributes.add(libAttributess[i]);
- attrbMap.put(libAttributess[i].getName(), libAttributess[i]);
+ attributes.add(libAttributess[j]);
+ attrbMap.put(libAttributess[j].getName(), libAttributess[j]);
}
}
- for (int i = 0; i < componentExtensions.length; i++) {
- if(attrbMap.containsKey(componentExtensions[i].getName())) {
- attributes.add(componentExtensions[i]);
+ if(includeComponentExtensions) {
+ for (int i = 0; i < componentExtensions.length; i++) {
+ if(attrbMap.containsKey(componentExtensions[i].getName())) {
+ attributes.add(componentExtensions[i]);
+ }
}
}
return attributes.toArray(new IAttribute[attributes.size()]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-25 21:23:26 UTC (rev 16210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-06-25 21:51:46 UTC (rev 16211)
@@ -338,8 +338,6 @@
}
} else {
for (int i = 0; i < components.length; i++) {
- if (components[i] == null)
- continue;
TextProposal[] componentProposals = components[i].getProposals(query, context);
for (int j = 0; j < componentProposals.length; j++) {
proposals.add(componentProposals[j]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 21:23:26 UTC (rev 16210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 21:51:46 UTC (rev 16211)
@@ -69,9 +69,15 @@
@Override
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
CustomProposalType[] types = getProposals();
+ if(types.length==1) {
+ return types[0].getProposals(query, context);
+ }
List<TextProposal> proposals = new ArrayList<TextProposal>();
for (int i = 0; i < types.length; i++) {
- // TODO
+ TextProposal[] typeProposals = types[i].getProposals(query, context);
+ for (int j = 0; j < typeProposals.length; j++) {
+ proposals.add(typeProposals[j]);
+ }
}
return proposals.toArray(new TextProposal[0]);
}
15 years, 6 months
JBoss Tools SVN: r16210 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-06-25 17:23:26 -0400 (Thu, 25 Jun 2009)
New Revision: 16210
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
Log:
SeamELContentAssistTestCase JUnit Test is fixed:
testSeamELContentAssist() test case is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2009-06-25 20:49:29 UTC (rev 16209)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2009-06-25 21:23:26 UTC (rev 16210)
@@ -498,7 +498,28 @@
existingProposals.add(proposalString);
filteredValidProposals.remove(proposalString);
} else {
- nonExistingProposals.add(proposalString);
+ String validProposal = null;
+ if (proposalString.indexOf("(") > -1) {
+ String methodName = proposalString.substring(0, proposalString.indexOf("(")).trim();
+ // Find method with the same name in filtered valid proposals
+ for (String valid : filteredValidProposals) {
+ if (valid.indexOf("(") > -1) {
+ String validName = valid.substring(0, valid.indexOf("(")).trim();
+
+ if (methodName.equals(validName)) {
+ validProposal = valid;
+ break;
+ }
+ }
+ }
+ }
+ if (validProposal != null) {
+ existingProposals.add(validProposal);
+ filteredValidProposals.remove(validProposal);
+ } else {
+ nonExistingProposals.add(proposalString);
+ }
+
}
}
}
@@ -586,7 +607,27 @@
existingProposals.add(proposalString);
filteredValidProposals.remove(proposalString);
} else {
- nonExistingProposals.add(proposalString);
+ String validProposal = null;
+ if (proposalString.indexOf("(") > -1) {
+ String methodName = proposalString.substring(0, proposalString.indexOf("(")).trim();
+ // Find method with the same name in filtered valid proposals
+ for (String valid : filteredValidProposals) {
+ if (valid.indexOf("(") > -1) {
+ String validName = valid.substring(0, valid.indexOf("(")).trim();
+
+ if (methodName.equals(validName)) {
+ validProposal = valid;
+ break;
+ }
+ }
+ }
+ }
+ if (validProposal != null) {
+ existingProposals.add(validProposal);
+ filteredValidProposals.remove(validProposal);
+ } else {
+ nonExistingProposals.add(proposalString);
+ }
}
}
}
15 years, 6 months
JBoss Tools SVN: r16209 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-25 16:49:29 -0400 (Thu, 25 Jun 2009)
New Revision: 16209
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-06-25 18:15:21 UTC (rev 16208)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-06-25 20:49:29 UTC (rev 16209)
@@ -400,20 +400,6 @@
<param value="false" />
</proposal>
</attribute>
- <attribute name="validator">
- <proposal type="beanMethodBySignature">
- <param name="returnType" value="void" />
- <param name="paramType" value="javax.faces.context.FacesContext" />
- <param name="paramType" value="javax.faces.component.UIComponent" />
- <param name="paramType" value="java.lang.Object" />
- </proposal>
- </attribute>
- <attribute name="valueChangeListener">
- <proposal type="beanMethodBySignature">
- <param name="returnType" value="void" />
- <param name="paramType" value="javax.faces.event.ValueChangeEvent" />
- </proposal>
- </attribute>
</component>
<component name="inplaceSelect">
<attribute name="showControls">
@@ -422,20 +408,6 @@
<param value="false" />
</proposal>
</attribute>
- <attribute name="validator">
- <proposal type="beanMethodBySignature">
- <param name="returnType" value="void" />
- <param name="paramType" value="javax.faces.context.FacesContext" />
- <param name="paramType" value="javax.faces.component.UIComponent" />
- <param name="paramType" value="java.lang.Object" />
- </proposal>
- </attribute>
- <attribute name="valueChangeListener">
- <proposal type="beanMethodBySignature">
- <param name="returnType" value="void" />
- <param name="paramType" value="javax.faces.event.ValueChangeEvent" />
- </proposal>
- </attribute>
</component>
<component name="inputNumberSlider">
<attribute name="orientation">
15 years, 6 months
JBoss Tools SVN: r16208 - in trunk/maven: features/org.jboss.tools.maven.seam.feature and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-25 14:15:21 -0400 (Thu, 25 Jun 2009)
New Revision: 16208
Modified:
trunk/maven/features/org.jboss.tools.maven.feature/feature.properties
trunk/maven/features/org.jboss.tools.maven.feature/feature.xml
trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.properties
trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml
trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties
Log:
add sdk + source features; add qualifiers; switch to JBoss by Red Hat
Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.feature/feature.properties 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/features/org.jboss.tools.maven.feature/feature.properties 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,12 +1,12 @@
###############################################################################
-# Copyright (c) 2008 JBoss, a division of Red Hat and others.
+# Copyright (c) 2008 JBoss by Red Hat and others.
# All rights reserved. This program and the accompanying materials
# are 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:
-# JBoss, a division of Red Hat - Initial implementation.
+# JBoss by Red Hat - Initial implementation.
##############################################################################
# feature.properties
# contains externalized strings for feature.xml
@@ -18,7 +18,7 @@
featureName=JBoss Maven Integration
# "providerName" property - name of the company that provides the feature
-providerName=JBoss, a division of Red Hat
+providerName=JBoss by Red Hat
# "updateSiteName" property - label for the update site
updateSiteName=JBossTools Update Site
@@ -27,8 +27,8 @@
description=JBoss Maven Integration
# "copyright" property - text of the "Feature Update Copyright"
-copyright=Copyright (c) 2008 JBoss, a division of Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
-are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss, a division of Red Hat - Initial implementation.\n
+copyright=Copyright (c) 2008 JBoss by Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
+are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss by Red Hat - Initial implementation.\n
############### end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.maven.feature"
- label="%featureName"
- version="1.0.0"
- provider-name="%providerName"
- plugin="org.jboss.tools.maven.ui">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
- </url>
-
- <plugin
- id="org.jboss.tools.maven.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.maven.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.maven.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.maven.ui">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
+ <plugin
+ id="org.jboss.tools.maven.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.maven.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.properties 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.properties 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,12 +1,12 @@
###############################################################################
-# Copyright (c) 2008 JBoss, a division of Red Hat and others.
+# Copyright (c) 2008 JBoss by Red Hat and others.
# All rights reserved. This program and the accompanying materials
# are 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:
-# JBoss, a division of Red Hat - Initial implementation.
+# JBoss by Red Hat - Initial implementation.
##############################################################################
# feature.properties
# contains externalized strings for feature.xml
@@ -15,20 +15,20 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=Integration Seam projects with Maven
+featureName=JBoss Maven Seam Integration
# "providerName" property - name of the company that provides the feature
-providerName=JBoss, a division of Red Hat
+providerName=JBoss by Red Hat
# "updateSiteName" property - label for the update site
updateSiteName=JBossTools Update Site
# "description" property - description of the feature
-description=Integration Seam projects with Maven
+description=JBoss Maven Seam Integration
# "copyright" property - text of the "Feature Update Copyright"
-copyright=Copyright (c) 2008 JBoss, a division of Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
-are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss, a division of Red Hat - Initial implementation.\n
+copyright=Copyright (c) 2008 JBoss by Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
+are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss by Red Hat - Initial implementation.\n
############### end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.maven.seam.feature"
- label="%featureName"
- version="1.0.0"
- provider-name="%providerName"
- plugin="org.jboss.tools.maven.seam">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
- </url>
-
- <plugin
- id="org.jboss.tools.maven.seam"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.maven.seam.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.maven.seam">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ </url>
+
+ <plugin
+ id="org.jboss.tools.maven.seam"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2009-06-25 18:15:21 UTC (rev 16208)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: JBoss Maven Core
Bundle-SymbolicName: org.jboss.tools.maven.core; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.maven.core.MavenCoreActivator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.common.project.facet.core;visibility:=reexport,
@@ -21,6 +21,6 @@
org.eclipse.jdt.launching;visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: JBoss, a division of Red Hat
+Bundle-Vendor: JBoss by Red Hat
Export-Package: org.jboss.tools.maven.core,
org.jboss.tools.maven.core.internal.project.facet
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-06-25 18:15:21 UTC (rev 16208)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Integration Seam projects with Maven
Bundle-SymbolicName: org.jboss.tools.maven.seam;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.maven.seam.MavenSeamActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -12,4 +12,4 @@
org.eclipse.jst.j2ee.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: JBoss, a division of Red Hat
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,2 +1,2 @@
-blurb=Integration Seam projects with Maven\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss, a division of Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=Integration Seam projects with Maven\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss by Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2009-06-25 18:15:21 UTC (rev 16208)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: JBoss Maven Integration
Bundle-SymbolicName: org.jboss.tools.maven.ui; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.jboss.tools.maven.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -12,4 +12,4 @@
org.jboss.tools.maven.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: JBoss, a division of Red Hat
+Bundle-Vendor: JBoss by Red Hat
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties 2009-06-25 16:50:25 UTC (rev 16207)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties 2009-06-25 18:15:21 UTC (rev 16208)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss, a division of Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss by Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
15 years, 6 months
JBoss Tools SVN: r16207 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-06-25 12:50:25 -0400 (Thu, 25 Jun 2009)
New Revision: 16207
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4509, test for openOn from file in jar was added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-06-25 16:39:43 UTC (rev 16206)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-06-25 16:50:25 UTC (rev 16207)
@@ -15,6 +15,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.core.JarEntryFile;
+import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
+import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
@@ -49,34 +55,65 @@
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT);
IFile file = (IFile) project.findMember("WebContent/tags/facelets.taglib.xml"); //$NON-NLS-1$
- IEditorInput input = new FileEditorInput(file);
- MultiPageEditorPart editorPart = (MultiPageEditorPart) PlatformUI.getWorkbench().
- getActiveWorkbenchWindow().
- getActivePage().
- openEditor(input,getEditorId(file.getName()));
- IEditorPart[] editorParts = editorPart.findEditors(input);
+ IEditorInput editorInput = new FileEditorInput(file);
+ JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 12, 17, "paginator.xhtml"); //$NON-NLS-1$
+ }
+
+
+ //test openon for taglib from in file
+ public void testOpenOnForTaglibInJarFile() throws Throwable {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
+ JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME);
+ IJavaProject javaProject = JavaCore.create(project);
+
+ IFile jarArchive = (IFile) project.findMember("WebContent/WEB-INF/lib/mareshkau.jar"); //$NON-NLS-1$
+
+ IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(jarArchive);
+
+ JarPackageFragmentRoot jarRoot = (JarPackageFragmentRoot) root;
+ JarEntryFile fileInJar = new JarEntryFile("META-INF/mareshkau.taglib.xml"); //$NON-NLS-1$s
+ fileInJar.setParent(jarRoot);
+ JarEntryEditorInput jarEditorInput = new JarEntryEditorInput(fileInJar);
+ JBIDE4509Test.checkOpenOnInEditor(jarEditorInput, getEditorId(fileInJar.getName()),12, 25,
+ "components/paginator.xhtml"); //$NON-NLS-1$
+ }
+
+ private static final void checkOpenOnInEditor(IEditorInput editorInput,String editorId,int lineNumber, int lineOffset, String openedOnFileName) throws Throwable {
+ MultiPageEditorPart editorPart = (MultiPageEditorPart) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(editorInput, editorId);
+ IEditorPart[] editorParts = editorPart.findEditors(editorInput);
editorPart.setActiveEditor(editorParts[0]);
StructuredTextEditor textEditor = (StructuredTextEditor) editorParts[0];
-
- int openOnPosition = TestUtil.getLinePositionOffcet(textEditor.getTextViewer(),12,17);
- //hack to get hyperlinks detectors, no other was have been founeded
- Method method = AbstractTextEditor.class.getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$
+ int openOnPosition = TestUtil.getLinePositionOffcet(textEditor
+ .getTextViewer(),lineNumber, lineOffset);
+ // hack to get hyperlinks detectors, no other was have been founded
+ Method method = AbstractTextEditor.class
+ .getDeclaredMethod("getSourceViewerConfiguration"); //$NON-NLS-1$
method.setAccessible(true);
- SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method.invoke(textEditor);
- IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration.getHyperlinkDetectors(textEditor.getTextViewer());
+ SourceViewerConfiguration sourceViewerConfiguration = (SourceViewerConfiguration) method
+ .invoke(textEditor);
+ IHyperlinkDetector[] hyperlinkDetectors = sourceViewerConfiguration
+ .getHyperlinkDetectors(textEditor.getTextViewer());
for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) {
- IHyperlink [] hyperLinks = iHyperlinkDetector.detectHyperlinks(textEditor.getTextViewer(), new Region(openOnPosition,0), false);
- if(hyperLinks!=null && hyperLinks.length>0 && hyperLinks[0] instanceof AbstractHyperlink) {
+ IHyperlink[] hyperLinks = iHyperlinkDetector.detectHyperlinks(
+ textEditor.getTextViewer(), new Region(openOnPosition, 0),
+ false);
+ if (hyperLinks != null && hyperLinks.length > 0
+ && hyperLinks[0] instanceof AbstractHyperlink) {
AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0];
abstractHyperlink.open();
break;
}
}
- IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- assertEquals("Active page should be ","paginator.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$//$NON-NLS-2$
- }
-
- private static String getEditorId(String filename) {
+ IEditorPart activeEditor = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals(
+ "Active page should be ", openedOnFileName, activeEditor.getEditorInput().getName()); //$NON-NLS-1$
+
+ }
+
+ private static final String getEditorId(String filename) {
IWorkbench workbench = PlatformUI.getWorkbench();
IEditorRegistry editorRegistry = workbench.getEditorRegistry();
IEditorDescriptor descriptor = editorRegistry
15 years, 6 months
JBoss Tools SVN: r16206 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-06-25 12:39:43 -0400 (Thu, 25 Jun 2009)
New Revision: 16206
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
The Var-s processing is added to the context calculation
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-06-25 16:37:39 UTC (rev 16205)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2009-06-25 16:39:43 UTC (rev 16206)
@@ -81,6 +81,9 @@
* @param vars
*/
public void addVar(Region region, Var var) {
+ if (this.vars.get(region) == null) {
+ this.vars.put(region, new HashSet<Var>());
+ }
this.vars.get(region).add(var);
allVars.add(var);
}
15 years, 6 months
JBoss Tools SVN: r16205 - in trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-06-25 12:37:39 -0400 (Thu, 25 Jun 2009)
New Revision: 16205
Modified:
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-770 -Fixed the bug devoted to cut headers,corrected numeration in footers-now it's in the bottom right corner of the page.</p>
</body></html>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-06-25 15:15:44 UTC (rev 16204)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-06-25 16:37:39 UTC (rev 16205)
@@ -12,7 +12,112 @@
<!-- overwriting links properties -->
<xsl:param name="ulink.show" select="0"></xsl:param>
-
+
+
+ <xsl:attribute-set name="header.content.properties">
+ <xsl:attribute name="font-family">Helvetica</xsl:attribute>
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+
+ </xsl:attribute-set>
+ <xsl:template name="header.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+ <fo:block>
+ <!-- sequence can be odd, even, first, blank
+ position can be left, center, right-->
+ <xsl:choose>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'center'">
+ <xsl:value-of
+ select="ancestor-or-self::book/bookinfo/corpauthor"/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'left'">
+ <fo:page-number/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'center'">
+ <xsl:text>This page intentionally left blank</xsl:text>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'right'">
+ </xsl:when>
+
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
+
+ <xsl:template name="footer.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+
+ <!--
+ <fo:block>
+ <xsl:value-of select="$pageclass"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$sequence"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$position"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$gentext-key"/>
+ </fo:block>
+ -->
+
+ <fo:block>
+ <!-- pageclass can be front, body, back -->
+ <!-- sequence can be odd, even, first, blank -->
+ <!-- position can be left, center, right -->
+ <xsl:choose>
+ <xsl:when test="($sequence = 'odd'or $sequence = 'even' or $sequence = 'blank' or $sequence = 'first') and $position = 'right'">
+ <fo:page-number/>
+ </xsl:when>
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
+ <!-- added-->
+
<xsl:attribute-set name="xref.properties">
<xsl:attribute name="text-decoration">
<xsl:choose>
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-06-25 15:15:44 UTC (rev 16204)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-06-25 16:37:39 UTC (rev 16205)
@@ -208,8 +208,114 @@
</xsl:template>
<!--avoid page sequence to generate blank pages after even page numbers -->
+ <!--<xsl:param name="page.margin.top">0.1in</xsl:param>
+ <xsl:param name="region.before.extent">0.6in</xsl:param>
+ <xsl:param name="body.margin.top">0.9in</xsl:param>-->
+
+ <xsl:attribute-set name="header.content.properties">
+ <xsl:attribute name="font-family">Helvetica</xsl:attribute>
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+
+ </xsl:attribute-set>
+ <xsl:template name="header.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+ <fo:block>
+ <!-- sequence can be odd, even, first, blank
+ position can be left, center, right-->
+ <xsl:choose>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'odd' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'center'">
+ <xsl:call-template name="draft.text"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'even' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'left'">
+ <xsl:apply-templates select="."
+ mode="object.title.markup"/>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'right'">
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'first' and $position = 'center'">
+ <xsl:value-of
+ select="ancestor-or-self::book/bookinfo/corpauthor"/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'left'">
+ <fo:page-number/>
+
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'center'">
+ <xsl:text>This page intentionally left blank</xsl:text>
+ </xsl:when>
+
+ <xsl:when test="$sequence = 'blank' and $position = 'right'">
+ </xsl:when>
+
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
- <xsl:template name="force.page.count">
+ <xsl:template name="footer.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+
+ <!--
+ <fo:block>
+ <xsl:value-of select="$pageclass"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$sequence"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$position"/>
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="$gentext-key"/>
+ </fo:block>
+ -->
+
+ <fo:block>
+ <!-- pageclass can be front, body, back -->
+ <!-- sequence can be odd, even, first, blank -->
+ <!-- position can be left, center, right -->
+ <xsl:choose>
+ <xsl:when test="($sequence = 'odd'or $sequence = 'even' or $sequence = 'blank' or $sequence = 'first') and $position = 'right'">
+ <fo:page-number/>
+ </xsl:when>
+ </xsl:choose>
+ </fo:block>
+ </xsl:template>
+ <!--added-->
+ <xsl:template name="force.page.count">
<xsl:param name="element" select="local-name(.)"/>
<xsl:param name="master-reference" select="''"/>
<xsl:text>no-force</xsl:text>
15 years, 6 months