JBoss Tools SVN: r6787 - trunk/jbpm/docs/resources/styles/en.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 11:55:45 -0500 (Fri, 07 Mar 2008)
New Revision: 6787
Removed:
trunk/jbpm/docs/resources/styles/en/highlight.xsl
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
now the highlighter is taken from online resource
Deleted: trunk/jbpm/docs/resources/styles/en/highlight.xsl
===================================================================
--- trunk/jbpm/docs/resources/styles/en/highlight.xsl 2008-03-07 16:54:19 UTC (rev 6786)
+++ trunk/jbpm/docs/resources/styles/en/highlight.xsl 2008-03-07 16:55:45 UTC (rev 6787)
@@ -1,18 +0,0 @@
-<!DOCTYPE xsl:stylesheet>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
- <xsl:variable name="kidz">
- <xsl:apply-templates></xsl:apply-templates>
- </xsl:variable>
- <pre class="{@role}">
- <xsl:value-of
- select="javahl:highlight(string($kidz), attribute::role)"
- xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
- disable-output-escaping="yes"/>
- </pre>
- </xsl:template>
-
-</xsl:stylesheet>
16 years, 3 months
JBoss Tools SVN: r6786 - trunk/documentation/guides/resources/styles/en.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 11:54:19 -0500 (Fri, 07 Mar 2008)
New Revision: 6786
Removed:
trunk/documentation/guides/resources/styles/en/highlight.xsl
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
now the highlighter is taken from online resource
Deleted: trunk/documentation/guides/resources/styles/en/highlight.xsl
===================================================================
--- trunk/documentation/guides/resources/styles/en/highlight.xsl 2008-03-07 16:54:05 UTC (rev 6785)
+++ trunk/documentation/guides/resources/styles/en/highlight.xsl 2008-03-07 16:54:19 UTC (rev 6786)
@@ -1,18 +0,0 @@
-<!DOCTYPE xsl:stylesheet>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
- <xsl:variable name="kidz">
- <xsl:apply-templates></xsl:apply-templates>
- </xsl:variable>
- <pre class="{@role}">
- <xsl:value-of
- select="javahl:highlight(string($kidz), attribute::role)"
- xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
- disable-output-escaping="yes"/>
- </pre>
- </xsl:template>
-
-</xsl:stylesheet>
16 years, 3 months
JBoss Tools SVN: r6784 - trunk/jsf/docs/resources/styles/en.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 11:53:18 -0500 (Fri, 07 Mar 2008)
New Revision: 6784
Removed:
trunk/jsf/docs/resources/styles/en/highlight.xsl
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
now the highlighter is taken from online resource
Deleted: trunk/jsf/docs/resources/styles/en/highlight.xsl
===================================================================
--- trunk/jsf/docs/resources/styles/en/highlight.xsl 2008-03-07 16:53:10 UTC (rev 6783)
+++ trunk/jsf/docs/resources/styles/en/highlight.xsl 2008-03-07 16:53:18 UTC (rev 6784)
@@ -1,18 +0,0 @@
-<!DOCTYPE xsl:stylesheet>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
- <xsl:variable name="kidz">
- <xsl:apply-templates></xsl:apply-templates>
- </xsl:variable>
- <pre class="{@role}">
- <xsl:value-of
- select="javahl:highlight(string($kidz), attribute::role)"
- xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
- disable-output-escaping="yes"/>
- </pre>
- </xsl:template>
-
-</xsl:stylesheet>
16 years, 3 months
JBoss Tools SVN: r6783 - trunk/as/docs/resources/styles/en.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 11:53:10 -0500 (Fri, 07 Mar 2008)
New Revision: 6783
Removed:
trunk/as/docs/resources/styles/en/highlight.xsl
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
now the highlighter is taken from online resource
Deleted: trunk/as/docs/resources/styles/en/highlight.xsl
===================================================================
--- trunk/as/docs/resources/styles/en/highlight.xsl 2008-03-07 16:43:32 UTC (rev 6782)
+++ trunk/as/docs/resources/styles/en/highlight.xsl 2008-03-07 16:53:10 UTC (rev 6783)
@@ -1,18 +0,0 @@
-<!DOCTYPE xsl:stylesheet>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
- <xsl:variable name="kidz">
- <xsl:apply-templates></xsl:apply-templates>
- </xsl:variable>
- <pre class="{@role}">
- <xsl:value-of
- select="javahl:highlight(string($kidz), attribute::role)"
- xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
- disable-output-escaping="yes"/>
- </pre>
- </xsl:template>
-
-</xsl:stylesheet>
16 years, 3 months
JBoss Tools SVN: r6782 - trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-07 11:43:32 -0500 (Fri, 07 Mar 2008)
New Revision: 6782
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml 2008-03-07 16:08:20 UTC (rev 6781)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml 2008-03-07 16:43:32 UTC (rev 6782)
@@ -24,4 +24,8 @@
<description>New Server Runtime Wizard</description>
<topic href="runtimes_servers.html#d0e246" label="Runtimes"/>
</context>
+ <context id="new_dynamic_web_project" title="New Dynamic Web Project">
+ <description>New Dynamic Web Project Wizard</description>
+ <topic href="webtools.html#d0e1335" label="Adding Facets to a Project"/>
+ </context>
</contexts>
\ No newline at end of file
16 years, 3 months
JBoss Tools SVN: r6781 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-07 11:08:20 -0500 (Fri, 07 Mar 2008)
New Revision: 6781
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-03-07 15:13:04 UTC (rev 6780)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-03-07 16:08:20 UTC (rev 6781)
@@ -107,6 +107,7 @@
// make modifications to parent
handle.setTitle(Messages.rwf_Title);
handle.setImageDescriptor(getImageDescriptor());
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.jboss.ide.eclipse.as.doc.user.new_server_runtime");
return main;
}
16 years, 3 months
JBoss Tools SVN: r6780 - in trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-07 10:13:04 -0500 (Fri, 07 Mar 2008)
New Revision: 6780
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/ASContextHelp.xml 2008-03-07 15:13:04 UTC (rev 6780)
@@ -0,0 +1,27 @@
+<contexts>
+ <context id="run_on_server" title="Run On Server">
+ <description>Run On Server Wizard</description>
+ <topic href="modules.html#run_on_server_wizard" label="Deploying with Run On Server Wizard"/>
+ </context>
+ <context id="add_and_remove_projects" title="Add and Remove Projects">
+ <description>Add and Remove Projects Wizard</description>
+ <topic href="quick_start.html#deployment" label="Deploying an Application to a Server"/>
+ <topic href="modules.html#single_file_deployment" label="Deploying single files"/>
+ </context>
+ <context id="new_xpath" title="New XPath">
+ <description>New XPath Wizard</description>
+ <topic href="perspective.html#d0e779" label="Bottom Part of the JBoss Server View"/>
+ </context>
+ <context id="new_war" title="New WAR">
+ <description>New WAR Wizard</description>
+ <topic href="perspective.html#Creating an archive" label="Creating an Archive"/>
+ </context>
+ <context id="fileset" title="Fileset Wizard">
+ <description>Fileset Wizard</description>
+ <topic href="perspective.html#CreatingaFileSet" label="Creating a FileSet"/>
+ </context>
+ <context id="new_server_runtime" title="New Server Runtime">
+ <description>New Server Runtime Wizard</description>
+ <topic href="runtimes_servers.html#d0e246" label="Runtimes"/>
+ </context>
+</contexts>
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF 2008-03-07 15:05:46 UTC (rev 6779)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF 2008-03-07 15:13:04 UTC (rev 6780)
@@ -4,4 +4,5 @@
Bundle-SymbolicName: org.jboss.ide.eclipse.as.doc.user;singleton:=true
Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.help
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml 2008-03-07 15:05:46 UTC (rev 6779)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/plugin.xml 2008-03-07 15:13:04 UTC (rev 6780)
@@ -6,6 +6,13 @@
<toc
file="toc.xml"
primary="true"/>
- </extension>
+ </extension>
+ <extension
+ point="org.eclipse.help.contexts">
+ <contexts
+ file="ASContextHelp.xml"
+ plugin="org.jboss.ide.eclipse.as.doc.user">
+ </contexts>
+ </extension>
</plugin>
16 years, 3 months
JBoss Tools SVN: r6779 - trunk/hibernatetools/docs/reference.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 10:05:46 -0500 (Fri, 07 Mar 2008)
New Revision: 6779
Modified:
trunk/hibernatetools/docs/reference/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
Modified: trunk/hibernatetools/docs/reference/pom.xml
===================================================================
--- trunk/hibernatetools/docs/reference/pom.xml 2008-03-07 15:04:40 UTC (rev 6778)
+++ trunk/hibernatetools/docs/reference/pom.xml 2008-03-07 15:05:46 UTC (rev 6779)
@@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>hibernate-tools-ref-guide-${translation}</artifactId>
+ <artifactId>server-manager-ref-guide-${translation}</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
- <name>Hibernate_Tools_Reference_Guide_(${translation})</name>
+ <name>Server_Manager_Reference_Guide_(${translation})</name>
<build>
<plugins>
@@ -30,20 +30,10 @@
<type>jdocbook-style</type>
</dependency>
<dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0</version>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>highlight</artifactId>
+ <version>3.1.4.GA</version>
</dependency>
- <dependency>
- <groupId>de.java2html</groupId>
- <artifactId>java2html</artifactId>
- <version>5.0</version>
- </dependency>
- <dependency>
- <groupId>com.exadel.docbook.colorer</groupId>
- <artifactId>highlight</artifactId>
- <version>1.0</version>
- </dependency>
</dependencies>
<configuration>
<sourceDocumentName>master.xml</sourceDocumentName>
16 years, 3 months
JBoss Tools SVN: r6778 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/lib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-07 10:04:40 -0500 (Fri, 07 Mar 2008)
New Revision: 6778
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
Log:
JBIDE-1785 Optimization of searching methods used in starting Seam model.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-03-07 14:54:17 UTC (rev 6777)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-03-07 15:04:40 UTC (rev 6778)
@@ -94,12 +94,8 @@
ComponentStorage components = new ComponentStorage();
FactoryStorage factories = new FactoryStorage();
+ VariablesStorage variables = new VariablesStorage();
- Set<ISeamContextVariable> allVariables = new HashSet<ISeamContextVariable>();
-
- Set<ISeamContextVariable> allVariablesCopy = null;
- Set<ISeamContextVariable> allVariablesPlusShort = null;
-
Map<String, ISeamPackage> packages = new HashMap<String, ISeamPackage>();
List<ISeamProjectChangeListener> listeners = new ArrayList<ISeamProjectChangeListener>();
@@ -426,9 +422,7 @@
usedBy.clear();
components.clear();
factories.clear();
- allVariables.clear();
- allVariablesCopy = null;
- allVariablesPlusShort = null;
+ variables.clear();
imports.clear();
packages.clear();
createScopes();
@@ -729,6 +723,10 @@
if(components.length == 0 && factories.length == 0 && ds.getImports().size() == 0) {
pathRemoved(source);
+ if(source.toString().endsWith(".jar")) {
+ if(!sourcePaths.contains(source)) sourcePaths.add(source);
+ sourcePaths2.put(source, ds);
+ }
return;
}
if(!sourcePaths.contains(source)) sourcePaths.add(source);
@@ -860,13 +858,15 @@
factoryDeclarationsRemoved(currentFactories);
+ variables.revalidate(source);
+
try {
registerComponentsInDependentProjects(ds, source);
} catch (CloneNotSupportedException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
+
private static String getClassName(ISeamComponentDeclaration d) {
if(d instanceof ISeamJavaComponentDeclaration) {
return ((ISeamJavaComponentDeclaration)d).getClassName();
@@ -1146,34 +1146,23 @@
* @see org.jboss.tools.seam.core.ISeamProject#getVariables()
*/
public Set<ISeamContextVariable> getVariables() {
- Set<ISeamContextVariable> vs = allVariablesCopy;
- if(vs == null) {
- synchronized(this) {
- allVariablesCopy = new HashSet<ISeamContextVariable>();
- allVariablesCopy.addAll(allVariables);
- vs = allVariablesCopy;
- }
- }
- return vs;
+ return variables.getVariablesCopy();
}
- public synchronized void addVariable(ISeamContextVariable v) {
- if(allVariables.contains(v)) return;
- allVariablesCopy = null;
- allVariablesPlusShort = null;
- allVariables.add(v);
+ public void addVariable(ISeamContextVariable v) {
+ variables.add(v);
}
- public synchronized void removeVariable(ISeamContextVariable v) {
- if(!allVariables.contains(v)) return;
- allVariablesCopy = null;
- allVariablesPlusShort = null;
- allVariables.remove(v);
+ public void removeVariable(ISeamContextVariable v) {
+ variables.remove(v);
}
- public synchronized void setImports(String source, List<String> paths) {
+ public void setImports(String source, List<String> paths) {
if(equalLists(imports.get(source), paths)) return;
- allVariablesPlusShort = null;
+ synchronized(variables) {
+ variables.allVariablesPlusShort = null;
+ variables.byName = null;
+ }
imports.put(source, paths);
}
@@ -1186,9 +1175,11 @@
return true;
}
- public synchronized void removeImports(String source) {
+ public void removeImports(String source) {
if(!imports.containsKey(source)) return;
- allVariablesPlusShort = null;
+ synchronized(variables) {
+ variables.allVariablesPlusShort = null;
+ }
imports.remove(source);
}
@@ -1196,27 +1187,11 @@
* @see org.jboss.tools.seam.core.ISeamProject#getVariables()
*/
public Set<ISeamContextVariable> getVariables(boolean includeShortNames) {
- Set<ISeamContextVariable> vs = getVariables();
if(!includeShortNames) {
- return vs;
+ return variables.getVariablesCopy();
+ } else {
+ return variables.getVariablesPlusShort();
}
- Set<ISeamContextVariable> result = allVariablesPlusShort;
- if(result != null) return result;
- synchronized (this) {
- result = new HashSet<ISeamContextVariable>();
- result.addAll(vs);
- for (ISeamContextVariable v: vs) {
- String n = v.getName();
- int i = n.lastIndexOf('.');
- if(i < 0) continue;
- String packageName = n.substring(0, i);
- if(isImportedPackage(packageName)) {
- result.add(new SeamContextShortVariable(v));
- }
- }
- allVariablesPlusShort = result;
- }
- return result;
}
public boolean isImportedPackage(String packageName) {
@@ -1231,13 +1206,7 @@
* @see org.jboss.tools.seam.core.ISeamProject#getVariablesByName(java.lang.String)
*/
public Set<ISeamContextVariable> getVariablesByName(String name) {
- Set<ISeamContextVariable> result = new HashSet<ISeamContextVariable>();
- for (ISeamContextVariable v: getVariables(true)) {
- if(name.equals(v.getName())) {
- result.add(v);
- }
- }
- return result;
+ return variables.getByName(name);
}
/**
@@ -1471,26 +1440,7 @@
* @see org.jboss.tools.seam.core.ISeamProject#getVariablesByPath(org.eclipse.core.runtime.IPath)
*/
public Set<ISeamContextVariable> getVariablesByPath(IPath path) {
- Set<ISeamContextVariable> result = new HashSet<ISeamContextVariable>();
- for (ISeamContextVariable variable : getVariables(true)) {
- if(variable instanceof ISeamComponent) {
- ISeamComponent c = (ISeamComponent)variable;
- for (ISeamComponentDeclaration d: c.getAllDeclarations()) {
- SeamComponentDeclaration di = (SeamComponentDeclaration)d;
- if(path.equals(di.getSourcePath())) {
- result.add(variable);
- break;
- }
- }
- } else {
- IResource variableResource = variable.getResource();
- if(variableResource == null) continue;
- if(path.equals(variableResource.getFullPath())) {
- result.add(variable);
- }
- }
- }
- return result;
+ return variables.getByPath(path);
}
/**
@@ -1824,4 +1774,126 @@
}
+ class VariablesStorage {
+ Set<ISeamContextVariable> allVariables = new HashSet<ISeamContextVariable>();
+ Set<ISeamContextVariable> allVariablesCopy = null;
+ Set<ISeamContextVariable> allVariablesPlusShort = null;
+ Map<IPath, Set<ISeamContextVariable>> byPath = null;
+ Map<String, Set<ISeamContextVariable>> byName = null;
+
+ public void clear() {
+ allVariables.clear();
+ clearCopies();
+ }
+
+ synchronized void clearCopies() {
+ allVariablesCopy = null;
+ allVariablesPlusShort = null;
+ byName = null;
+ byPath = null;
+ }
+
+ public Set<ISeamContextVariable> getVariablesCopy() {
+ Set<ISeamContextVariable> vs = allVariablesCopy;
+ if(vs == null) {
+ synchronized(this) {
+ allVariablesCopy = new HashSet<ISeamContextVariable>();
+ allVariablesCopy.addAll(allVariables);
+ vs = allVariablesCopy;
+ }
+ }
+ return vs;
+ }
+
+ public Set<ISeamContextVariable> getVariablesPlusShort() {
+ Set<ISeamContextVariable> vs = getVariablesCopy();
+ Set<ISeamContextVariable> result = allVariablesPlusShort;
+ if(result != null) return result;
+ synchronized (this) {
+ result = new HashSet<ISeamContextVariable>();
+ result.addAll(vs);
+ for (ISeamContextVariable v: vs) {
+ String n = v.getName();
+ int i = n.lastIndexOf('.');
+ if(i < 0) continue;
+ String packageName = n.substring(0, i);
+ if(isImportedPackage(packageName)) {
+ result.add(new SeamContextShortVariable(v));
+ }
+ }
+ allVariablesPlusShort = result;
+ }
+ return result;
+ }
+
+ public synchronized void add(ISeamContextVariable v) {
+ if(allVariables.contains(v)) return;
+ clearCopies();
+ allVariables.add(v);
+ }
+
+ public synchronized void remove(ISeamContextVariable v) {
+ if(!allVariables.contains(v)) return;
+ clearCopies();
+ allVariables.remove(v);
+ }
+
+ public synchronized void revalidate(IPath path) {
+ byPath = null;
+ byName = null;
+ }
+
+ private void create() {
+ byName = new HashMap<String, Set<ISeamContextVariable>>();
+ byPath = new HashMap<IPath, Set<ISeamContextVariable>>();
+ Set<ISeamContextVariable> q = getVariablesPlusShort();
+ for (ISeamContextVariable v : q) {
+ if(v instanceof ISeamComponent) {
+ ISeamComponent c = (ISeamComponent)v;
+ for (ISeamComponentDeclaration d: c.getAllDeclarations()) {
+ SeamComponentDeclaration di = (SeamComponentDeclaration)d;
+ addForPath(di.getSourcePath(), v);
+ }
+ } else {
+ IResource variableResource = v.getResource();
+ if(variableResource != null) {
+ addForPath(variableResource.getFullPath(), v);
+ }
+ }
+
+ String n = "" + v.getName();
+ Set<ISeamContextVariable> s = byName.get(n);
+ if(s == null) {
+ s = new HashSet<ISeamContextVariable>();
+ byName.put(n, s);
+ }
+ s.add(v);
+ }
+ }
+
+ private void addForPath(IPath p, ISeamContextVariable v) {
+ if(p == null) return;
+ Set<ISeamContextVariable> s = byPath.get(p);
+ if(s == null) {
+ s = new HashSet<ISeamContextVariable>();
+ byPath.put(p, s);
+ }
+ s.add(v);
+ }
+
+ public synchronized Set<ISeamContextVariable> getByName(String n) {
+ if(byName == null) {
+ create();
+ }
+ return byName.get(n);
+ }
+
+ public synchronized Set<ISeamContextVariable> getByPath(IPath p) {
+ if(byPath == null) {
+ create();
+ }
+ return byPath.get(p);
+ }
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2008-03-07 14:54:17 UTC (rev 6777)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2008-03-07 15:04:40 UTC (rev 6778)
@@ -185,14 +185,19 @@
if(SYSTEM_JAR_SET.contains(fileName)) continue;
String jsname = "lib-" + fileName; //$NON-NLS-1$
XModelObject o = model.getByPath("FileSystems").getChildByPath(jsname); //$NON-NLS-1$
- if(!scanner.isLikelyComponentSource(o)) continue;
+ if(o == null) continue;
LoadedDeclarations c = null;
try {
- c = scanner.parse(o, new Path(p));
+ if(scanner.isLikelyComponentSource(o)) {
+ c = scanner.parse(o, new Path(p));
+ }
} catch (ScannerException e) {
SeamCorePlugin.getDefault().logError(e);
}
+ if(c == null) {
+ c = new LoadedDeclarations();
+ }
if(c != null) {
componentsLoaded(c, new Path(p));
}
@@ -225,7 +230,7 @@
}
void componentsLoaded(LoadedDeclarations c, IPath path) {
- if(c == null || c.getComponents().size() + c.getFactories().size() == 0) return;
+ if(c == null) return;
project.registerComponents(c, path);
}
16 years, 3 months
JBoss Tools SVN: r6777 - trunk/jsf/docs/userguide.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-07 09:54:17 -0500 (Fri, 07 Mar 2008)
New Revision: 6777
Modified:
trunk/jsf/docs/userguide/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1703
Modified: trunk/jsf/docs/userguide/pom.xml
===================================================================
--- trunk/jsf/docs/userguide/pom.xml 2008-03-07 14:52:51 UTC (rev 6776)
+++ trunk/jsf/docs/userguide/pom.xml 2008-03-07 14:54:17 UTC (rev 6777)
@@ -30,20 +30,10 @@
<type>jdocbook-style</type>
</dependency>
<dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0</version>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>highlight</artifactId>
+ <version>3.1.4.GA</version>
</dependency>
- <dependency>
- <groupId>de.java2html</groupId>
- <artifactId>java2html</artifactId>
- <version>5.0</version>
- </dependency>
- <dependency>
- <groupId>com.exadel.docbook.colorer</groupId>
- <artifactId>highlight</artifactId>
- <version>1.0</version>
- </dependency>
</dependencies>
<configuration>
<sourceDocumentName>master.xml</sourceDocumentName>
16 years, 3 months