March 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r14110 - in branches/jbosstools-3.0.x/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-03-09 09:56:04 -0400 (Mon, 09 Mar 2009) New Revision: 14110 Added: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java Modified: branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java Log: JBIDE-3967 - add test case and commit into the brunch Modified: branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-09 13:36:15 UTC (rev 14109) +++ branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -87,6 +87,7 @@ protected AllEntitiesProcessor processor = new AllEntitiesProcessor(); protected JPAMapToolActor() { + processor.initAnnotationStylePreference(); } public static JPAMapToolActor getInstance() { Modified: branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-09 13:36:15 UTC (rev 14109) +++ branches/jbosstools-3.0.x/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -62,6 +62,9 @@ protected ArrayList<ChangeStructure> changes = new ArrayList<ChangeStructure>(); public AllEntitiesProcessor() { + } + + public void initAnnotationStylePreference() { IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore(); int value = preferenceStore.getInt(AllEntitiesProcessor.class.toString()); if (value >= AnnotStyle.values().length) { Added: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java (rev 0) +++ branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +// just specific test case +public interface Entity extends Identifiable <Long> +{ Long getId (); } Added: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java (rev 0) +++ branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +public interface Identifiable <Type> +{ Type getId (); } \ No newline at end of file Added: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java (rev 0) +++ branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +// just specific test case +public interface Entity extends Identifiable <Long> +{ Long getId (); } Added: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java (rev 0) +++ branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +public interface Identifiable <Type> +{ Type getId (); } \ No newline at end of file Modified: branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java =================================================================== --- branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-09 13:36:15 UTC (rev 14109) +++ branches/jbosstools-3.0.x/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-09 13:56:04 UTC (rev 14110) @@ -125,6 +125,11 @@ // "test.annotated." + testSelection + ".Foto"); //$NON-NLS-1$ //$NON-NLS-2$ //ICompilationUnit icu2 = Utils.findCompilationUnit(javaProject, // "test.annotated." + testSelection + ".Person"); //$NON-NLS-1$ //$NON-NLS-2$ + ICompilationUnit icu4 = null; + if (testSelection == TEST_GETTERS) { + icu4 = Utils.findCompilationUnit(javaProject, + "test.annotated." + testSelection + ".FotoXPerson"); //$NON-NLS-1$ //$NON-NLS-2$ + } assertNotNull(icu); assertNotNull(icu2); assertNotNull(icu3); @@ -132,6 +137,9 @@ collector.collect(icu); collector.collect(icu2); collector.collect(icu3); + if (icu4 != null) { + collector.collect(icu4); + } collector.resolveRelations(); processor.modify(javaProject, collector.getMapCUs_Info(), false); // @@ -142,6 +150,9 @@ checkItem("Staff"); //$NON-NLS-1$ checkItem("FotoXPerson"); //$NON-NLS-1$ checkItem("PersonXFoto"); //$NON-NLS-1$ + if (icu4 != null) { + checkItem("Entity"); //$NON-NLS-1$ + } } protected void checkItem(String strCheckItem) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14109 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-03-09 09:36:15 -0400 (Mon, 09 Mar 2009) New Revision: 14109 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java Log: JBIDE-3967 - add test case for the issue Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-09 13:28:41 UTC (rev 14108) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -87,6 +87,7 @@ protected AllEntitiesProcessor processor = new AllEntitiesProcessor(); protected JPAMapToolActor() { + processor.initAnnotationStylePreference(); } public static JPAMapToolActor getInstance() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-09 13:28:41 UTC (rev 14108) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -62,6 +62,9 @@ protected ArrayList<ChangeStructure> changes = new ArrayList<ChangeStructure>(); public AllEntitiesProcessor() { + } + + public void initAnnotationStylePreference() { IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore(); int value = preferenceStore.getInt(AllEntitiesProcessor.class.toString()); if (value >= AnnotStyle.values().length) { Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Entity.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +// just specific test case +public interface Entity extends Identifiable <Long> +{ Long getId (); } Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Identifiable.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +public interface Identifiable <Type> +{ Type getId (); } \ No newline at end of file Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Entity.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +// just specific test case +public interface Entity extends Identifiable <Long> +{ Long getId (); } Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Identifiable.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +public interface Identifiable <Type> +{ Type getId (); } \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-09 13:28:41 UTC (rev 14108) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-03-09 13:36:15 UTC (rev 14109) @@ -125,6 +125,11 @@ // "test.annotated." + testSelection + ".Foto"); //$NON-NLS-1$ //$NON-NLS-2$ //ICompilationUnit icu2 = Utils.findCompilationUnit(javaProject, // "test.annotated." + testSelection + ".Person"); //$NON-NLS-1$ //$NON-NLS-2$ + ICompilationUnit icu4 = null; + if (testSelection == TEST_GETTERS) { + icu4 = Utils.findCompilationUnit(javaProject, + "test.annotated." + testSelection + ".FotoXPerson"); //$NON-NLS-1$ //$NON-NLS-2$ + } assertNotNull(icu); assertNotNull(icu2); assertNotNull(icu3); @@ -132,6 +137,9 @@ collector.collect(icu); collector.collect(icu2); collector.collect(icu3); + if (icu4 != null) { + collector.collect(icu4); + } collector.resolveRelations(); processor.modify(javaProject, collector.getMapCUs_Info(), false); // @@ -142,6 +150,9 @@ checkItem("Staff"); //$NON-NLS-1$ checkItem("FotoXPerson"); //$NON-NLS-1$ checkItem("PersonXFoto"); //$NON-NLS-1$ + if (icu4 != null) { + checkItem("Entity"); //$NON-NLS-1$ + } } protected void checkItem(String strCheckItem) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14108 - in trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-09 09:28:41 -0400 (Mon, 09 Mar 2009) New Revision: 14108 Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl Log: https://jira.jboss.org/jira/browse/JBDS-489 - new 'releaseTest' profile was created Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common-diff.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -1,6 +1,97 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> +  + <xsl:template name="toc.line"> + <xsl:param name="toc-context" select="."/> + <xsl:param name="depth" select="1"/> + <xsl:param name="depth.from.context" select="8"/> + + <xsl:param name="min-diff" select="10"/> + <xsl:param name="pos" select="position()"/> + <span> + <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute> + +  +  + <xsl:if test="$autotoc.label.in.hyperlink = 0"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="context" select="$toc-context"/> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:choose> + <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">updated</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + + +  +  + <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <xsl:apply-templates select="." mode="titleabbrev.markup"/> + </a> + </span> + </xsl:template> +  + <xsl:template name="markerTypes"> + <xsl:param name="marker-type" /> + <xsl:param name="marker-value" /> + <xsl:choose> + <xsl:when test="$marker-type = 'attribute'"> + <xsl:attribute name="class"> + <xsl:value-of select="$marker-value" /> + </xsl:attribute> + </xsl:when> + <xsl:when test="$marker-type = 'image'"> + <xsl:choose> + <xsl:when test="$marker-value='changed'"> + <img src="images/updated.png" alt="updated" class="img_marker" /> + </xsl:when> + <xsl:when test="$marker-value='added'"> + <img src="images/new.png" alt="updated" class="img_marker" /> + </xsl:when> + </xsl:choose> + </xsl:when> + </xsl:choose> + </xsl:template>  <xsl:template match="//diffmk:wrapper"> <xsl:choose> @@ -17,5 +108,141 @@ </xsl:otherwise> </xsl:choose> </xsl:template> +  + +<xsl:template name="component.title"> + <xsl:param name="node" select="."/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="level"> + <xsl:choose> + <xsl:when test="ancestor::section"> + <xsl:value-of select="count(ancestor::section)+1"/> + </xsl:when> + <xsl:when test="ancestor::sect5">6</xsl:when> + <xsl:when test="ancestor::sect4">5</xsl:when> + <xsl:when test="ancestor::sect3">4</xsl:when> + <xsl:when test="ancestor::sect2">3</xsl:when> + <xsl:when test="ancestor::sect1">2</xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + + <xsl:element name="h{$level+1}"> + <xsl:attribute name="class"> + title + </xsl:attribute> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:element> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + + + +<xsl:template name="section.heading"> + <xsl:param name="section" select="."/> + <xsl:param name="level" select="1"/> + <xsl:param name="allow-anchors" select="1"/> + <xsl:param name="title"/> + <xsl:param name="class" select="'title'"/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="id"> + <xsl:choose> +  + <xsl:when test="contains(local-name(..), 'info')"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../.."/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + <xsl:variable name="hlevel"> + <xsl:choose> +  + <xsl:when test="$level > 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:element name="h{$hlevel}"> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> + <xsl:if test="$css.decoration != '0'"> + <xsl:if test="$hlevel<3"> + <xsl:attribute name="style">clear: both</xsl:attribute> + </xsl:if> + </xsl:if> + <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$section"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$title"/> + </xsl:element> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + + </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -61,28 +61,7 @@ </xsl:template> -  - <xsl:template name="markerTypes"> - <xsl:param name="marker-type" /> - <xsl:param name="marker-value" /> - <xsl:choose> - <xsl:when test="$marker-type = 'attribute'"> - <xsl:attribute name="class"> - <xsl:value-of select="$marker-value" /> - </xsl:attribute> - </xsl:when> - <xsl:when test="$marker-type = 'image'"> - <xsl:choose> - <xsl:when test="$marker-value='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> - </xsl:when> - <xsl:when test="$marker-value='added'"> - <img src="images/new.png" alt="updated" class="img_marker" /> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:template> + @@ -117,28 +96,7 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> - - <xsl:choose> - <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">updated</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - +   @@ -168,23 +126,6 @@  - -  - <xsl:template match="//diffmk:wrapper"> - <xsl:choose> - <xsl:when test="@diffmk:change='deleted'"> - <xsl:text> </xsl:text> - </xsl:when> - <xsl:when test="parent::node()[local-name()='title']"> - <xsl:value-of select="."/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="."/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="abstract" mode="titlepage.mode"> @@ -196,142 +137,7 @@ </xsl:call-template> </xsl:template> - -<xsl:template name="component.title"> - <xsl:param name="node" select="."/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - <xsl:variable name="level"> - <xsl:choose> - <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> - </xsl:when> - <xsl:when test="ancestor::sect5">6</xsl:when> - <xsl:when test="ancestor::sect4">5</xsl:when> - <xsl:when test="ancestor::sect3">4</xsl:when> - <xsl:when test="ancestor::sect2">3</xsl:when> - <xsl:when test="ancestor::sect1">2</xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> -  - - <xsl:element name="h{$level+1}"> - <xsl:attribute name="class"> - title - </xsl:attribute> - <xsl:if test="$generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:apply-templates select="$node" mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - </xsl:element> - -  - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - - - -<xsl:template name="section.heading"> - <xsl:param name="section" select="."/> - <xsl:param name="level" select="1"/> - <xsl:param name="allow-anchors" select="1"/> - <xsl:param name="title"/> - <xsl:param name="class" select="'title'"/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - - <xsl:variable name="id"> - <xsl:choose> -  - <xsl:when test="contains(local-name(..), 'info')"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="../.."/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - <xsl:variable name="hlevel"> - <xsl:choose> -  - <xsl:when test="$level > 5">6</xsl:when> - <xsl:otherwise> - <xsl:value-of select="$level + 1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:element name="h{$hlevel}"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> - <xsl:if test="$css.decoration != '0'"> - <xsl:if test="$hlevel<3"> - <xsl:attribute name="style">clear: both</xsl:attribute> - </xsl:if> - </xsl:if> - <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$section"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> - <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> - </xsl:if> - <xsl:copy-of select="$title"/> - </xsl:element> - -  - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - - - - </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml-single.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -1,6 +1,98 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> +  + <xsl:template name="toc.line"> + <xsl:param name="toc-context" select="."/> + <xsl:param name="depth" select="1"/> + <xsl:param name="depth.from.context" select="8"/> + <xsl:param name="min-diff" select="10"/> + <xsl:param name="pos" select="position()"/> + + <span> + <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute> + +  +  + <xsl:if test="$autotoc.label.in.hyperlink = 0"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="context" select="$toc-context"/> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:choose> + <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">updated</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + + +  +  + <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$label"/> + <xsl:if test="$label != ''"> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + </xsl:if> + + <xsl:apply-templates select="." mode="titleabbrev.markup"/> + </a> + </span> + </xsl:template> +  + <xsl:template name="markerTypes"> + <xsl:param name="marker-type" /> + <xsl:param name="marker-value" /> + <xsl:choose> + <xsl:when test="$marker-type = 'attribute'"> + <xsl:attribute name="class"> + <xsl:value-of select="$marker-value" /> + </xsl:attribute> + </xsl:when> + <xsl:when test="$marker-type = 'image'"> + <xsl:choose> + <xsl:when test="$marker-value='changed'"> + <img src="images/updated.png" alt="updated" class="img_marker" /> + </xsl:when> + <xsl:when test="$marker-value='added'"> + <img src="images/new.png" alt="updated" class="img_marker" /> + </xsl:when> + </xsl:choose> + </xsl:when> + </xsl:choose> + </xsl:template> +  <xsl:template match="//diffmk:wrapper"> <xsl:choose> @@ -17,5 +109,142 @@ </xsl:otherwise> </xsl:choose> </xsl:template> +  + +<xsl:template name="component.title"> + <xsl:param name="node" select="."/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="level"> + <xsl:choose> + <xsl:when test="ancestor::section"> + <xsl:value-of select="count(ancestor::section)+1"/> + </xsl:when> + <xsl:when test="ancestor::sect5">6</xsl:when> + <xsl:when test="ancestor::sect4">5</xsl:when> + <xsl:when test="ancestor::sect3">4</xsl:when> + <xsl:when test="ancestor::sect2">3</xsl:when> + <xsl:when test="ancestor::sect1">2</xsl:when> + <xsl:otherwise>1</xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + + <xsl:element name="h{$level+1}"> + <xsl:attribute name="class"> + title + </xsl:attribute> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:element> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + + + +<xsl:template name="section.heading"> + <xsl:param name="section" select="."/> + <xsl:param name="level" select="1"/> + <xsl:param name="allow-anchors" select="1"/> + <xsl:param name="title"/> + <xsl:param name="class" select="'title'"/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + + <xsl:variable name="id"> + <xsl:choose> +  + <xsl:when test="contains(local-name(..), 'info')"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="../.."/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select=".."/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + +  + <xsl:variable name="hlevel"> + <xsl:choose> +  + <xsl:when test="$level > 5">6</xsl:when> + <xsl:otherwise> + <xsl:value-of select="$level + 1"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:element name="h{$hlevel}"> + <xsl:attribute name="class"> + <xsl:value-of select="$class"/> + </xsl:attribute> + <xsl:if test="$css.decoration != '0'"> + <xsl:if test="$hlevel<3"> + <xsl:attribute name="style">clear: both</xsl:attribute> + </xsl:if> + </xsl:if> + <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$section"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + </xsl:if> + <xsl:copy-of select="$title"/> + </xsl:element> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +</xsl:template> + + + </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -61,28 +61,6 @@ </xsl:template> -  - <xsl:template name="markerTypes"> - <xsl:param name="marker-type" /> - <xsl:param name="marker-value" /> - <xsl:choose> - <xsl:when test="$marker-type = 'attribute'"> - <xsl:attribute name="class"> - <xsl:value-of select="$marker-value" /> - </xsl:attribute> - </xsl:when> - <xsl:when test="$marker-type = 'image'"> - <xsl:choose> - <xsl:when test="$marker-value='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> - </xsl:when> - <xsl:when test="$marker-value='added'"> - <img src="images/new.png" alt="updated" class="img_marker" /> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:template> @@ -116,30 +94,7 @@ <xsl:with-param name="context" select="$toc-context"/> <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> - </xsl:attribute> - - <xsl:choose> - <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">attribute</xsl:with-param> - <xsl:with-param name="marker-value">updated</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - - + </xsl:attribute>   <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> @@ -160,7 +115,7 @@  - <xsl:template match="//diffmk:wrapper"> +  @@ -186,142 +141,6 @@ </xsl:call-template> </xsl:template> - -<xsl:template name="component.title"> - <xsl:param name="node" select="."/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - <xsl:variable name="level"> - <xsl:choose> - <xsl:when test="ancestor::section"> - <xsl:value-of select="count(ancestor::section)+1"/> - </xsl:when> - <xsl:when test="ancestor::sect5">6</xsl:when> - <xsl:when test="ancestor::sect4">5</xsl:when> - <xsl:when test="ancestor::sect3">4</xsl:when> - <xsl:when test="ancestor::sect2">3</xsl:when> - <xsl:when test="ancestor::sect1">2</xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - - <xsl:element name="h{$level+1}"> - <xsl:attribute name="class"> - title - </xsl:attribute> - <xsl:if test="$generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:apply-templates select="$node" mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - </xsl:element> - -  - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - - - -<xsl:template name="section.heading"> - <xsl:param name="section" select="."/> - <xsl:param name="level" select="1"/> - <xsl:param name="allow-anchors" select="1"/> - <xsl:param name="title"/> - <xsl:param name="class" select="'title'"/> - <xsl:param name="pos" select="position()"/> - <xsl:param name="min-diff" select="10"/> - - <xsl:variable name="id"> - <xsl:choose> -  - <xsl:when test="contains(local-name(..), 'info')"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="../.."/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - -  - <xsl:variable name="hlevel"> - <xsl:choose> -  - <xsl:when test="$level > 5">6</xsl:when> - <xsl:otherwise> - <xsl:value-of select="$level + 1"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:element name="h{$hlevel}"> - <xsl:attribute name="class"> - <xsl:value-of select="$class"/> - </xsl:attribute> - <xsl:if test="$css.decoration != '0'"> - <xsl:if test="$hlevel<3"> - <xsl:attribute name="style">clear: both</xsl:attribute> - </xsl:if> - </xsl:if> - <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$section"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - </xsl:if> - <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> - <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> - </xsl:if> - <xsl:copy-of select="$title"/> - </xsl:element> - -  - <xsl:choose> - <xsl:when test="current()/parent::node()[@diffmk:change='added']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">added</xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> - <xsl:call-template name="markerTypes"> - <xsl:with-param name="marker-type">image</xsl:with-param> - <xsl:with-param name="marker-value">changed</xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> - -</xsl:template> - - - - </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-release.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -8,7 +8,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> - <xsl:import href="common.xsl"/> + <xsl:import href="common_diff.xsl"/> <xsl:import href="xhtml.xsl"/> <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -0,0 +1,17 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> + <xsl:import href="common.xsl"/> + <xsl:import href="xhtml-single.xsl"/> + <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> + <xsl:template match="//diffmk:wrapper"> + <xsl:value-of select="."/> + </xsl:template> +</xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-release.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -8,7 +8,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/> - <xsl:import href="common.xsl"/> + <xsl:import href="common_diff.xsl"/> <xsl:import href="xhtml-single.xsl"/> <xsl:param name="html.stylesheet" select="'css/tools_release.css'"/> </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-09 13:28:20 UTC (rev 14107) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single.xsl 2009-03-09 13:28:41 UTC (rev 14108) @@ -88,5 +88,4 @@ <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> </xsl:template> - </xsl:stylesheet>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14107 - trunk/as/docs/reference.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-09 09:28:20 -0400 (Mon, 09 Mar 2009) New Revision: 14107 Modified: trunk/as/docs/reference/pom.xml Log: https://jira.jboss.org/jira/browse/JBDS-489 - new 'releaseTest' profile was created Modified: trunk/as/docs/reference/pom.xml =================================================================== --- trunk/as/docs/reference/pom.xml 2009-03-09 13:28:02 UTC (rev 14106) +++ trunk/as/docs/reference/pom.xml 2009-03-09 13:28:20 UTC (rev 14107) @@ -21,6 +21,15 @@ </properties> </profile> <profile> + <id>releaseTest</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> + </properties> + </profile> + <profile> <id>releaseJBDS</id> <properties> <master>master_output.xml</master>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14106 - trunk/documentation/guides/Exadel-migration.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-09 09:28:02 -0400 (Mon, 09 Mar 2009) New Revision: 14106 Modified: trunk/documentation/guides/Exadel-migration/pom.xml Log: https://jira.jboss.org/jira/browse/JBDS-489 - new 'releaseTest' profile was created Modified: trunk/documentation/guides/Exadel-migration/pom.xml =================================================================== --- trunk/documentation/guides/Exadel-migration/pom.xml 2009-03-09 13:12:13 UTC (rev 14105) +++ trunk/documentation/guides/Exadel-migration/pom.xml 2009-03-09 13:28:02 UTC (rev 14106) @@ -21,6 +21,15 @@ </properties> </profile> <profile> + <id>releaseTest</id> + <properties> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/com/jboss/tools/xhtml-single-release-nomarker.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/com/jboss/tools/xhtml-release-nomarker.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/com/jboss/tools/pdf.xsl</xsl-pdf> + </properties> + </profile> + <profile> <id>releaseJBDS</id> <properties> <master>master_output.xml</master>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14105 - in branches/jbosstools-3.0.x: seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-03-09 09:12:13 -0400 (Mon, 09 Mar 2009) New Revision: 14105 Modified: branches/jbosstools-3.0.x/ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java Log: Merged revisions 14104 via svnmerge from https://svn.jboss.org/repos/jbosstools/trunk ........ r14104 | max.andersen(a)jboss.com | 2009-03-09 13:56:52 +0100 (Mon, 09 Mar 2009) | 1 line fixed possible stream leakage for JBIDE-3632 ........ Property changes on: branches/jbosstools-3.0.x ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-13898,14088,14102 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 + /trunk:1-13898,14088,14102,14104 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 12:56:52 UTC (rev 14104) +++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 13:12:13 UTC (rev 14105) @@ -160,14 +160,26 @@ if(getVersion() == SeamVersion.SEAM_2_1) { Properties seamProperties = new Properties(); File testSeamPropertiesFile = new File(testSrcDir, "seam.properties"); + FileInputStream inStream = null; + FileOutputStream out = null; try { - seamProperties.load(new FileInputStream(testSeamPropertiesFile)); + inStream = new FileInputStream(testSeamPropertiesFile); + seamProperties.load(inStream); seamProperties.setProperty("org.jboss.seam.core.init.debug", "false"); //$NON-NLS-1$ //$NON-NLS-2$ - seamProperties.store(new FileOutputStream(testSeamPropertiesFile), "debug is explicitly disabled in test to avoid JBIDE-3623"); + + out = new FileOutputStream(testSeamPropertiesFile); + seamProperties.store(out, "debug is explicitly disabled in test to avoid JBIDE-3623"); } catch (FileNotFoundException e) { SeamCorePlugin.getPluginLog().logError(e); } catch (IOException e) { SeamCorePlugin.getPluginLog().logError(e); + } finally { + if(inStream!=null) { + try { inStream.close(); } catch (IOException e) { /**ignore*/ } + } + if(out!=null) { + try { out.close(); } catch (IOException e) { /**ignore*/ } + } } }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14104 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-03-09 08:56:52 -0400 (Mon, 09 Mar 2009) New Revision: 14104 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java Log: fixed possible stream leakage for JBIDE-3632 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 11:47:59 UTC (rev 14103) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-03-09 12:56:52 UTC (rev 14104) @@ -160,14 +160,26 @@ if(getVersion() == SeamVersion.SEAM_2_1) { Properties seamProperties = new Properties(); File testSeamPropertiesFile = new File(testSrcDir, "seam.properties"); + FileInputStream inStream = null; + FileOutputStream out = null; try { - seamProperties.load(new FileInputStream(testSeamPropertiesFile)); + inStream = new FileInputStream(testSeamPropertiesFile); + seamProperties.load(inStream); seamProperties.setProperty("org.jboss.seam.core.init.debug", "false"); //$NON-NLS-1$ //$NON-NLS-2$ - seamProperties.store(new FileOutputStream(testSeamPropertiesFile), "debug is explicitly disabled in test to avoid JBIDE-3623"); + + out = new FileOutputStream(testSeamPropertiesFile); + seamProperties.store(out, "debug is explicitly disabled in test to avoid JBIDE-3623"); } catch (FileNotFoundException e) { SeamCorePlugin.getPluginLog().logError(e); } catch (IOException e) { SeamCorePlugin.getPluginLog().logError(e); + } finally { + if(inStream!=null) { + try { inStream.close(); } catch (IOException e) { /**ignore*/ } + } + if(out!=null) { + try { out.close(); } catch (IOException e) { /**ignore*/ } + } } }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14103 - in branches/jbosstools-3.0.x: jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-03-09 07:47:59 -0400 (Mon, 09 Mar 2009) New Revision: 14103 Modified: branches/jbosstools-3.0.x/ branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java Log: Merged revisions 14102 via svnmerge from https://svn.jboss.org/repos/jbosstools/trunk ........ r14102 | max.andersen(a)jboss.com | 2009-03-09 12:22:28 +0100 (Mon, 09 Mar 2009) | 1 line added null/empty checks for JBIDE-3972 ........ Property changes on: branches/jbosstools-3.0.x ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-13898,14088 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 + /trunk:1-13898,14088,14102 /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998,8009-8012,8078-8079 Modified: branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java =================================================================== --- branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09 11:22:28 UTC (rev 14102) +++ branches/jbosstools-3.0.x/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09 11:47:59 UTC (rev 14103) @@ -192,14 +192,14 @@ // There may be a few modules for resources from the same project. // Ignore module with jboss.singlefile type if there are other module types. IModule[] modules = ServerUtil.getModules(project); - if(modules.length>0) { + if(modules != null && modules.length>0) { for (int i = 0; i < modules.length; i++) { if(!"jboss.singlefile".equals(modules[i].getModuleType().getId())) { return modules[i]; } } } - return modules[0]; + return null; } public static void runRegisterInServerJob(IProject p, IServer server) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14102 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-03-09 07:22:28 -0400 (Mon, 09 Mar 2009) New Revision: 14102 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java Log: added null/empty checks for JBIDE-3972 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09 09:56:54 UTC (rev 14101) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2009-03-09 11:22:28 UTC (rev 14102) @@ -192,14 +192,14 @@ // There may be a few modules for resources from the same project. // Ignore module with jboss.singlefile type if there are other module types. IModule[] modules = ServerUtil.getModules(project); - if(modules.length>0) { + if(modules != null && modules.length>0) { for (int i = 0; i < modules.length; i++) { if(!"jboss.singlefile".equals(modules[i].getModuleType().getId())) { return modules[i]; } } } - return modules[0]; + return null; } public static void runRegisterInServerJob(IProject p, IServer server) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r14101 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-03-09 05:56:54 -0400 (Mon, 09 Mar 2009) New Revision: 14101 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java Log: JBIDE-3940 fix it Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2009-03-09 00:58:26 UTC (rev 14100) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2009-03-09 09:56:54 UTC (rev 14101) @@ -476,16 +476,14 @@ targetViewer)); } } - - - + toolkit.paintBordersFor(rootMainControl); form.pack(); /* * below is init GUIs */ - + Throwable throwable = null; try { this.initTransformViewerModel((IEditorSite) getSite(), @@ -746,8 +744,17 @@ } if (item == null) continue; - if (item.getData(REFERENCE_MODEL) != null && !item.isDisposed()) { - + Object referenceModel = item.getData(REFERENCE_MODEL); + if (referenceModel != null && !item.isDisposed()) { + if (!rootModel.getChildren().contains(referenceModel)) { + rootModel.addChild(referenceModel); + } + ((TreeItemRelationModel) referenceModel).setTreeItem(item); + AbstractStructuredDataModel model = (AbstractStructuredDataModel) graph_trasform_data_map + .get(item.getData()); + if (model == null) { + graph_trasform_data_map.put(item.getData(), referenceModel); + } } else { AbstractStructuredDataModel model = (AbstractStructuredDataModel) graph_trasform_data_map .get(item.getData()); @@ -770,6 +777,9 @@ this.rootModel.addChild(model); } } else { + if (!rootModel.getChildren().contains(model)) { + rootModel.addChild(model); + } ((TreeItemRelationModel) model).setTreeItem(item); } } @@ -1337,39 +1347,47 @@ this.analyzeGraphicalModel(listType, graphinformations, file); } } - + /** * * @param listType */ - protected void checkSmooksConfigFileModel(SmooksResourceListType listType){ - List<AbstractResourceConfig> list = listType.getAbstractResourceConfig(); + protected void checkSmooksConfigFileModel(SmooksResourceListType listType) { + List<AbstractResourceConfig> list = listType + .getAbstractResourceConfig(); ResourceConfigType globalParameterResource = null; for (Iterator iterator = list.iterator(); iterator.hasNext();) { AbstractResourceConfig arc = (AbstractResourceConfig) iterator .next(); - if(arc instanceof ResourceConfigType){ - String selector = ((ResourceConfigType)arc).getSelector(); - if(selector == null) continue; + if (arc instanceof ResourceConfigType) { + String selector = ((ResourceConfigType) arc).getSelector(); + if (selector == null) + continue; selector = selector.trim(); - if(SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)){ - globalParameterResource = (ResourceConfigType)arc; + if (SmooksModelConstants.GLOBAL_PARAMETERS.equals(selector)) { + globalParameterResource = (ResourceConfigType) arc; break; } } } - - if(globalParameterResource == null){ - globalParameterResource = SmooksFactory.eINSTANCE.createResourceConfigType(); - globalParameterResource.setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); - }else{ - String value = SmooksModelUtils.getParmaText("stream.filter.type", globalParameterResource); - if(value == null){ - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); - }else{ - if(value.trim().length() == 0){ - SmooksModelUtils.setParamText("stream.filter.type", "SAX", globalParameterResource); + + if (globalParameterResource == null) { + globalParameterResource = SmooksFactory.eINSTANCE + .createResourceConfigType(); + globalParameterResource + .setSelector(SmooksModelConstants.GLOBAL_PARAMETERS); + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); + } else { + String value = SmooksModelUtils.getParmaText("stream.filter.type", + globalParameterResource); + if (value == null) { + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); + } else { + if (value.trim().length() == 0) { + SmooksModelUtils.setParamText("stream.filter.type", "SAX", + globalParameterResource); } } }

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2009