JBoss Tools SVN: r2929 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-07 08:28:29 -0400 (Tue, 07 Aug 2007)
New Revision: 2929
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/bin/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/
Log:
more bin ignore
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui
___________________________________________________________________
Name: svn:ignore
+ bin
18 years, 8 months
JBoss Tools SVN: r2928 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-07 08:27:22 -0400 (Tue, 07 Aug 2007)
New Revision: 2928
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/bin/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/
Log:
remove bin
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core
___________________________________________________________________
Name: svn:ignore
+ bin
18 years, 8 months
JBoss Tools SVN: r2927 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-08-07 08:18:13 -0400 (Tue, 07 Aug 2007)
New Revision: 2927
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationHTML.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-670 xhtml code completion does not update it's list of completions
Seam proposal calculation for XHTML editor is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationHTML.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationHTML.java 2007-08-07 11:57:34 UTC (rev 2926)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationHTML.java 2007-08-07 12:18:13 UTC (rev 2927)
@@ -28,6 +28,8 @@
import org.osgi.framework.Bundle;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.text.xml.contentassist.ContentAssistProcessorBuilder;
+import org.jboss.tools.common.text.xml.contentassist.ContentAssistProcessorDefinition;
import org.jboss.tools.jst.jsp.contentassist.RedHatHtmlContentAssistProcessor;
public class ExtendedStructuredTextViewerConfigurationHTML extends StructuredTextViewerConfigurationHTML {
@@ -37,16 +39,31 @@
}
protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
- IContentAssistProcessor[] processors = null;
+// IContentAssistProcessor[] processors = null;
- if (partitionType == IHTMLPartitions.HTML_DEFAULT) {
- return new RedHatHtmlContentAssistProcessor[]{new RedHatHtmlContentAssistProcessor()};
+ // if we have our own processors we need
+ // to define them in plugin.xml file of their
+ // plugins using extention point
+ // "org.jboss.tools.common.text.xml.contentAssistProcessor"
+
+ ContentAssistProcessorDefinition[] defs = ContentAssistProcessorBuilder.getInstance().getContentAssistProcessorDefinitions(partitionType);
+
+ if(defs==null) return null;
+
+ List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
+ for(int i=0; i<defs.length; i++) {
+ IContentAssistProcessor processor = defs[i].createContentAssistProcessor();
+ if(!processors.contains(processor)) {
+ processors.add(processor);
+ }
}
- if(partitionType == IJSPPartitions.JSP_DEFAULT_EL) {
- return new RedHatHtmlContentAssistProcessor[]{new RedHatHtmlContentAssistProcessor()};
+
+ if (partitionType == IHTMLPartitions.HTML_DEFAULT ||
+ partitionType == IJSPPartitions.JSP_DEFAULT_EL) {
+ processors.add(new RedHatHtmlContentAssistProcessor());
}
- return processors;
+ return (IContentAssistProcessor[])processors.toArray(new IContentAssistProcessor[0]);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java 2007-08-07 11:57:34 UTC (rev 2926)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java 2007-08-07 12:18:13 UTC (rev 2927)
@@ -48,7 +48,8 @@
// to define them in plugin.xml file of their
// plugins using extention point
// "org.jboss.tools.common.text.xml.contentAssistProcessor"
-
+ IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(sourceViewer, partitionType);
+
ContentAssistProcessorDefinition[] defs = ContentAssistProcessorBuilder.getInstance().getContentAssistProcessorDefinitions(partitionType);
if(defs==null) return null;
@@ -69,10 +70,11 @@
(partitionType == IJSPPartitions.JSP_DEFAULT_EL) ||
(partitionType == IJSPPartitions.JSP_DEFAULT_EL2)) {
processors.add(new RedHatJSPContentAssistProcessor());
- return (IContentAssistProcessor[])processors.toArray(new IContentAssistProcessor[0]);
}
+ if (superProcessors != null && superProcessors.length > 0)
+ processors.add(superProcessors);
- return super.getContentAssistProcessors(sourceViewer, partitionType);
+ return (IContentAssistProcessor[])processors.toArray(new IContentAssistProcessor[0]);
}
/*
18 years, 8 months
JBoss Tools SVN: r2926 - in trunk/documentation/whatsnew: seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-07 07:57:34 -0400 (Tue, 07 Aug 2007)
New Revision: 2926
Added:
trunk/documentation/whatsnew/seam/componentsxmleditor.png
trunk/documentation/whatsnew/seam/el-componentsxml.png
trunk/documentation/whatsnew/seam/el-java.png
trunk/documentation/whatsnew/seam/el-xhtml.png
trunk/documentation/whatsnew/seam/seam-enabledisable.png
trunk/documentation/whatsnew/seam/seamcomponents-filter.png
trunk/documentation/whatsnew/seam/seamcomponents-labelscopepresentation.png
trunk/documentation/whatsnew/seam/seamcomponents-nodescopepresentation.png
trunk/documentation/whatsnew/seam/seamcomponentsview-projectexplorer.png
trunk/documentation/whatsnew/seam/seamcomponentsview.png
trunk/documentation/whatsnew/seam/seamvalidator-duplicatecomponentexample.png
trunk/documentation/whatsnew/seam/seamvalidator-preferences.png
trunk/documentation/whatsnew/seam/seamwebprojectwizard.png
trunk/documentation/whatsnew/seam/showview-seam components.png
trunk/documentation/whatsnew/seam/xmldirectedit.png
trunk/documentation/whatsnew/whatsnew.css
Removed:
trunk/documentation/whatsnew/default_.css
Modified:
trunk/documentation/whatsnew/seam/seam-news-1.0.0.beta1.html
Log:
new and noteworthy for seam 1 beta1
Deleted: trunk/documentation/whatsnew/default_.css
===================================================================
--- trunk/documentation/whatsnew/default_.css 2007-08-07 11:06:02 UTC (rev 2925)
+++ trunk/documentation/whatsnew/default_.css 2007-08-07 11:57:34 UTC (rev 2926)
@@ -1,15 +0,0 @@
-p, table, td, th { font-family: verdana, arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: verdana, arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: verdana, arial, helvetica, geneva; font-size: 10px}
-h3 { font-family: verdana, arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: verdana, arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: verdana, arial, helvetica, geneva; font-size: 24pt; font-weight: bold}
-body { font-family: verdana, arial, helvetica, geneva; font-size: 10pt; clip: rect( ); margin-top: 5mm; margin-left: 3mm}
-.indextop { font-size: x-large;; font-family: verdana, arial, helvetica, sans-serif; font-weight: bold}
-.indexsub { font-size: xx-small;; font-family: verdana, arial, helvetica, sans-serif; color: #8080FF}
-a.bar:link { text-decoration: none; color: #FFFFFF}
-a.bar:visited { color: #FFFFFF; text-decoration: none}
-a.bar:hover { color: #FFFFFF; text-decoration: underline}
-a.bar { color: #FFFFFF}
Added: trunk/documentation/whatsnew/seam/componentsxmleditor.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/componentsxmleditor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/el-componentsxml.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/el-componentsxml.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/el-java.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/el-java.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/el-xhtml.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/el-xhtml.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seam-enabledisable.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seam-enabledisable.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/seam/seam-news-1.0.0.beta1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-1.0.0.beta1.html 2007-08-07 11:06:02 UTC (rev 2925)
+++ trunk/documentation/whatsnew/seam/seam-news-1.0.0.beta1.html 2007-08-07 11:57:34 UTC (rev 2926)
@@ -1,7 +1,7 @@
<html>
<head>
-<link rel="stylesheet" href="default_.css">
+<link rel="stylesheet" href="../whatsnew.css">
<title>Seam Tools 1.0.beta1 News</title>
</head>
@@ -23,16 +23,16 @@
<td valign="top" align="left">
<p align="right"><b>Enable Seam Support</b></td>
<td valign="top">
- <p>This plugin is the first in enabling Seam for Eclipse
+ <p>The Seam plugin is the first in enabling Seam for Eclipse
projects. Currently there are two ways to enable it, use the
Seam Web Project Wizard and have a basic Seam Web project be
ready with Seam support or enable it on existing projects by
- right clicking on the project and choose "Enable/Disable Seam
+ right clicking on the project and choose "Add/Remove Seam
support"</p>
- <p><img src="enableseam.png"/></p>
+ <p><img src="seam-enabledisable.png"/></p>
- <p>Seam support on projects does *not* require your
+ <p>Seam support on projects does <b>not</b> require your
eclipse project to be a WTP project, it can be a plain old
Eclipse project (e.g. generated by Seam's seam-gen).</p>
@@ -68,13 +68,17 @@
<p align="right"><b>Component filters</b></td>
<td valign="top">
- <p>The size of the list can be quite daunting so you can filter
-the content to ignore components only defined in jar's. This will
-hide the many built-in Seam components and leave only those left that
-are actually defined in the project or have actively configured via
-components.xml</p>
+ <p>The Seam Component View can be filtered by choosing "Customize View..." and select the "Seam
+Components from Libraries" under the Filters tab.
- <p><img src="seamcomponentsview-filter.png"/></p>
+This will make the view ignore components defined in jar's.
+This will hide the many built-in Seam components and leave only those
+left that are actually defined in the project or have actively
+configured via components.xml.</p>
+
+<p>Consequently deselecting the filter will show you all available components. </p>
+
+ <p><img src="seamcomponents-filter.png"/></p>
</td>
</tr>
<tr>
@@ -87,9 +91,13 @@
<p align="right"><b>Scope presentation</b></td>
<td valign="top">
<p>The Seam Component View can show a components default scope
- in two ways. As labels on each component or as a node per scope
- where the components beneath it is in the same scope.</p>
- <p><img src="revengstrategyinui.png"></p>
+ in two ways.</p>
+
+<p>As labels on each component: </p>
+ <p><img src="seamcomponents-labelscopepresentation.png"></p>
+<p>...or as a node per scope where the components are grouped under a node representing its default scope.</p>
+ <p><img src="seamcomponents-nodescopepresentation.png"></p>
+
</td>
</tr>
<tr>
@@ -123,52 +131,83 @@
<td valign="top">
<p>Validation of various possible problematic definitions in Seam applications have been implemented. If an issue is found it will show up in the standard "Problems View".</p>
- <p>The validations can be run manually via the context menu on
- your project and click "Validate" which will execute all the
- WTP validations active on your project</p>
+ <p><img src="seamvalidator-duplicatecomponentexample.png"/></p>
- <p>On WTP projects it is by default executed automatically,
- but on normal Java projects you will have to go and enable
- the Validation builder on your project . It is available in
+ <p>The following is the preference screen for controlling the severity of the various validations:</p>
+
+ <p><img src="seamvalidator-preferences.png"/></p>
+
+
+ <p>On WTP projects validation are enabled by default and thus executed automatically,
+ but on normal Java projects you will have to go and add
+ the Validation builder to your project . It is available in
the properties of your project under "Validation".</p>
- <p><img src="seamvalidation.png"></p>
+ <p>The validations can be run manually by clicking "Validate" via the context menu on
+ your project which will execute all the active WTP validations.</p>
- <p>The validations can be individually configured to be ignored or reported as Error or Warning.</p>
-
- <p><img src="seamvalidationpreferences.png"/></p>
</td>
</tr>
<tr>
<td colspan="2">
<hr/>
- <h3>Code completion</h3>
+ <h3>Editing</h3>
<hr/>
</td>
</tr>
<tr>
<td valign="top" align="left">
- <p align="right"><b>Code completion for Seam Components</b></td>
+ <p align="right"><b>Expression Language (EL) code completion for Seam Components "everywhere"</b></td>
<td valign="top">
- <p>Last release brought an exporter that generates a basic CRUD <a
- href="http://www.jboss.com/products/seam">JBoss Seam</a>
- application. In this version this has been made complete and now generates a full working Seam application; read the generated README.TXT for details on how to deploy it</p>
+ <p>JBoss Tools uses the information gathered by the Seam plugin to provide EL code completion for Seam components almost everywhere.</p>
- <p><img src="codegenlaunchseamexporter.png"></p>
+<p>In jsf/xhtml/jsp:</p>
+
+<p><img src="el-xhtml.png"/></p>
+
+<p>In components.xml:</p>
+
+<p><img src="el-componentsxml.png"/></p>
+
+<p>...and even in Java:</p>
+
+<p><img src="el-java.png"/></p>
+
+<p>...and over time more will be added</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
</td>
</tr>
<tr>
<td valign="top" align="left">
- <p align="right"><b>Expression language "everywhere"!</b></td>
+ <p align="right"><b>Structured components.xml editor</b></td>
<td valign="top">
- <p>Last release brought an exporter that generates a basic CRUD <a
- href="http://www.jboss.com/products/seam">JBoss Seam</a>
- application. In this version this has been made complete and now generates a full working Seam application; read the generated README.TXT for details on how to deploy it</p>
+ <p>When editing components.xml a structured tree editor is available in addition to pure source editing.</p>
- <p><img src="codegenlaunchseamexporter.png"></p>
+<p><img src="componentsxmleditor.png"/></p>
+
+<p>The "plain vanilla" XML editor option is of course still available via "Open With...".</p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
</td>
</tr>
<tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Direct components.xml editing</b></td>
+ <td valign="top">
+ <p>components.xml (and other xml files) can be viewed and edited directly in the Project Explorer and Properties sheet without opening the components.xml editor</p>
+
+ <p><img src="xmldirectedit.png"/></p>
+
+ </td>
+ </tr>
<tr>
<td colspan="2">
<hr/>
@@ -178,13 +217,15 @@
</tr>
<tr>
<td valign="top" align="left">
- <p align="right"><b>Seam Project Wizard</b></td>
+ <p align="right"><b>Seam Wizards</b></td>
<td valign="top">
- <p>Last release brought an exporter that generates a basic CRUD <a
- href="http://www.jboss.com/products/seam">JBoss Seam</a>
- application. In this version this has been made complete and now generates a full working Seam application; read the generated README.TXT for details on how to deploy it</p>
+ <p>First cut of a Seam Web Project Wizard that generates a WTP war or ear project is made available.</p>
- <p><img src="codegenlaunchseamexporter.png"></p>
+ <p><img src="seamwebprojectwizard.png"></p>
+
+ <p>Note: The generated WTP projects currently depends on the associated server/runtime to provide the persistence related jars.</p>
+
+ <p>Seam wizards corresponding to seam-gen's New Action and New Form are also available.</p>
</td>
</tr>
<tr>
Added: trunk/documentation/whatsnew/seam/seamcomponents-filter.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamcomponents-filter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamcomponents-labelscopepresentation.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamcomponents-labelscopepresentation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamcomponents-nodescopepresentation.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamcomponents-nodescopepresentation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamcomponentsview-projectexplorer.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamcomponentsview-projectexplorer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamcomponentsview.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamcomponentsview.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamvalidator-duplicatecomponentexample.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamvalidator-duplicatecomponentexample.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamvalidator-preferences.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamvalidator-preferences.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/seamwebprojectwizard.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/seamwebprojectwizard.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/showview-seam components.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/showview-seam components.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/seam/xmldirectedit.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/seam/xmldirectedit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/whatsnew.css
===================================================================
--- trunk/documentation/whatsnew/whatsnew.css (rev 0)
+++ trunk/documentation/whatsnew/whatsnew.css 2007-08-07 11:57:34 UTC (rev 2926)
@@ -0,0 +1,15 @@
+p, table, td, th { font-family: verdana, arial, helvetica, geneva; font-size: 10pt}
+pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
+h2 { font-family: verdana, arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
+code { font-family: "Courier New", Courier, mono; font-size: 10pt}
+sup { font-family: verdana, arial, helvetica, geneva; font-size: 10px}
+h3 { font-family: verdana, arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
+li { font-family: verdana, arial, helvetica, geneva; font-size: 10pt}
+h1 { font-family: verdana, arial, helvetica, geneva; font-size: 24pt; font-weight: bold}
+body { font-family: verdana, arial, helvetica, geneva; font-size: 10pt; clip: rect( ); margin-top: 5mm; margin-left: 3mm}
+.indextop { font-size: x-large;; font-family: verdana, arial, helvetica, sans-serif; font-weight: bold}
+.indexsub { font-size: xx-small;; font-family: verdana, arial, helvetica, sans-serif; color: #8080FF}
+a.bar:link { text-decoration: none; color: #FFFFFF}
+a.bar:visited { color: #FFFFFF; text-decoration: none}
+a.bar:hover { color: #FFFFFF; text-decoration: underline}
+a.bar { color: #FFFFFF}
18 years, 8 months
JBoss Tools SVN: r2925 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor: src/org/jboss/tools/hibernate/ui/veditor/editors and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-08-07 07:06:02 -0400 (Tue, 07 Aug 2007)
New Revision: 2925
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ConnectionEditPart.java
Log:
http://jira.jboss.com/jira/browse/EXIN-365
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-08-06 23:10:59 UTC (rev 2924)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-08-07 11:06:02 UTC (rev 2925)
@@ -17,7 +17,8 @@
org.jboss.tools.common,
org.eclipse.jdt.core,
org.jboss.tools.common.model,
- org.jboss.tools.hibernate.ui.view
+ org.jboss.tools.hibernate.ui.view,
+ org.jboss.tools.common.gef
Bundle-Version: 2.0.0
Export-Package: org.jboss.tools.hibernate.ui.veditor,
org.jboss.tools.hibernate.ui.veditor.editors,
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/DiagramContentOutlinePage.java 2007-08-07 11:06:02 UTC (rev 2925)
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.ui.veditor.editors;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.*;
+import org.eclipse.draw2d.parts.*;
+import org.eclipse.gef.*;
+import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.gef.editparts.ZoomManager;
+import org.eclipse.gef.ui.parts.*;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.part.PageBook;
+
+
+public class DiagramContentOutlinePage extends ContentOutlinePage implements
+ IAdaptable {
+ private GraphicalViewer graphicalViewer;
+
+ private SelectionSynchronizer selectionSynchronizer;
+
+ private PageBook pageBook;
+
+ /*
+ * surface for drawing
+ */
+ private Canvas overview;
+
+ static final int ID_OUTLINE = 0;
+
+ static final int ID_OVERVIEW = 1;
+
+ private Thumbnail thumbnail;
+
+ IPageSite pSite;
+
+ /**
+ * The constructor
+ *
+ * @param viewer
+ */
+ public DiagramContentOutlinePage(EditPartViewer viewer) {
+ super(viewer);
+ }
+
+ /**
+ * Sets graphical viewer
+ *
+ * @param graphicalViewer
+ */
+ public void setGraphicalViewer(GraphicalViewer graphicalViewer) {
+ this.graphicalViewer = graphicalViewer;
+ }
+
+ public void update(GraphicalViewer graphicalViewer){
+ if(this.graphicalViewer != null){
+ if(this.graphicalViewer != graphicalViewer){
+ getSelectionSynchronizer().removeViewer(this.graphicalViewer);
+ replaceSelectionChangedListeners(graphicalViewer);
+ this.graphicalViewer = graphicalViewer;
+ getSelectionSynchronizer().addViewer(graphicalViewer);
+ initializeOverview();
+ }
+ }
+
+ }
+
+
+ /**
+ * @return graphical viewer
+ */
+ public GraphicalViewer getGraphicalViewer() {
+ return graphicalViewer;
+ }
+
+ /**
+ * sets selection synchronizer
+ *
+ * @param selectionSynchronizer
+ */
+ public void setSelectionSynchronizer(
+ SelectionSynchronizer selectionSynchronizer) {
+ this.selectionSynchronizer = selectionSynchronizer;
+ }
+
+ /**
+ * @return returns selection synchronizer
+ */
+ public SelectionSynchronizer getSelectionSynchronizer() {
+ return selectionSynchronizer;
+ }
+
+ /**
+ * initializator
+ */
+ public void init(IPageSite pageSite) {
+ super.init(pageSite);
+ this.pSite = pageSite;
+ }
+
+ /**
+ * Outline viewer configuration
+ *
+ */
+ protected void configureOutlineViewer() {
+ showPage(ID_OUTLINE);
+ }
+
+
+ /**
+ * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+ pageBook = new PageBook(parent, SWT.NONE);
+
+ overview = new Canvas(pageBook, SWT.NONE);
+ pageBook.showPage(overview);
+ configureOutlineViewer();
+ hookOutlineViewer();
+ initializeOutlineViewer();
+ }
+
+
+ /**
+ * @see org.eclipse.ui.part.IPage#dispose()
+ */
+ public void dispose() {
+ unhookOutlineViewer();
+ if (thumbnail != null)
+ thumbnail.deactivate();
+ super.dispose();
+ }
+
+
+ /**
+ * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+ */
+ public Object getAdapter(Class type) {
+ if (type == ZoomManager.class) {
+ return ((ScalableFreeformRootEditPart) getGraphicalViewer()
+ .getRootEditPart()).getZoomManager();
+ }
+ return null;
+ }
+
+
+ /**
+ * @see org.eclipse.ui.part.IPage#getControl()
+ */
+ public Control getControl() {
+ return pageBook;
+ }
+
+ /**
+ *
+ */
+ protected void hookOutlineViewer() {
+ getSelectionSynchronizer().addViewer(getViewer());
+ }
+
+ /**
+ *
+ */
+ protected void initializeOutlineViewer() {
+ }
+
+
+ /**
+ *
+ */
+ protected void initializeOverview() {
+ LightweightSystem lws = new LightweightSystem(overview);
+ RootEditPart rep = getGraphicalViewer().getRootEditPart();
+
+ if (rep instanceof ScalableFreeformRootEditPart) {
+ ScalableFreeformRootEditPart root = (ScalableFreeformRootEditPart) rep;
+ if(this.thumbnail != null) {
+ this.thumbnail.deactivate();
+ }
+ thumbnail = new ScrollableThumbnail((Viewport) root.getFigure());
+ thumbnail.setBorder(new MarginBorder(3));
+ thumbnail.setSource(root.getLayer(LayerConstants.PRINTABLE_LAYERS));
+ lws.setContents(thumbnail);
+ }
+ }
+
+ /**
+ * @param id
+ */
+ protected void showPage(int id) {
+
+ if (thumbnail == null)
+ initializeOverview();
+ pageBook.showPage(overview);
+ thumbnail.setVisible(true);
+
+ }
+
+ /**
+ *
+ */
+ protected void unhookOutlineViewer() {
+ getSelectionSynchronizer().removeViewer(getViewer());
+ }
+
+ Set listeners = new HashSet();
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ super.addSelectionChangedListener(listener);
+ listeners.add(listener);
+ }
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ super.removeSelectionChangedListener(listener);
+ listeners.remove(listener);
+ }
+
+ void replaceSelectionChangedListeners(GraphicalViewer graphicalViewer) {
+ Iterator it = listeners.iterator();
+ while(it.hasNext()) {
+ ISelectionChangedListener l = (ISelectionChangedListener)it.next();
+ getViewer().removeSelectionChangedListener(l);
+ graphicalViewer.addSelectionChangedListener(l);
+ }
+ }
+
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-08-06 23:10:59 UTC (rev 2924)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-08-07 11:06:02 UTC (rev 2925)
@@ -17,18 +17,17 @@
import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.SimpleFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.PrintAction;
import org.eclipse.gef.ui.actions.WorkbenchPartAction;
import org.eclipse.gef.ui.parts.GraphicalEditor;
-import org.eclipse.jface.action.IAction;
+import org.eclipse.gef.ui.parts.TreeViewer;
import org.eclipse.jface.util.TransferDropTargetListener;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.actions.ActionFactory;
-import org.hibernate.cfg.Configuration;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.mapping.RootClass;
+import org.jboss.tools.common.gef.edit.GEFRootEditPart;
import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram;
import org.jboss.tools.hibernate.ui.veditor.editors.parts.OrmEditPartFactory;
import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput;
@@ -52,7 +51,7 @@
protected void initializeGraphicalViewer() {
final GraphicalViewer viewer = getGraphicalViewer();
viewer.setEditPartFactory(new OrmEditPartFactory());
- viewer.setRootEditPart(new ScalableFreeformRootEditPart());
+ viewer.setRootEditPart(new GEFRootEditPart());
viewer.addDropTargetListener(createTransferDropTargetListener());
viewer.setContents(ormDiagram);
}
@@ -106,4 +105,16 @@
setPartName("Diagram for " + rootClass.getEntityName());
ormDiagram = new OrmDiagram(configuration, rootClass, objectEditorInput.getJavaProject());
}
+
+ public Object getAdapter(Class type) {
+ if (type == IContentOutlinePage.class) {
+ DiagramContentOutlinePage outline = new DiagramContentOutlinePage(
+ new TreeViewer());
+ outline.setGraphicalViewer(getGraphicalViewer());
+ outline.setSelectionSynchronizer(getSelectionSynchronizer());
+ return outline;
+ }
+
+ return super.getAdapter(type);
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ConnectionEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ConnectionEditPart.java 2007-08-06 23:10:59 UTC (rev 2924)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ConnectionEditPart.java 2007-08-07 11:06:02 UTC (rev 2925)
@@ -16,6 +16,8 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PolygonDecoration;
import org.eclipse.draw2d.PolylineConnection;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef.editpolicies.SelectionEditPolicy;
@@ -28,6 +30,7 @@
import org.hibernate.mapping.SingleTableSubclass;
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.Table;
+import org.jboss.tools.common.gef.edit.GEFRootEditPart;
import org.jboss.tools.hibernate.ui.veditor.editors.figures.RoundPolylineConnection;
import org.jboss.tools.hibernate.ui.veditor.editors.model.Connection;
import org.jboss.tools.hibernate.ui.veditor.editors.model.ModelElement;
@@ -35,12 +38,13 @@
class ConnectionEditPart extends AbstractConnectionEditPart
-implements PropertyChangeListener {
+implements PropertyChangeListener, EditPartListener {
public void activate() {
if (!isActive()) {
super.activate();
((ModelElement) getModel()).addPropertyChangeListener(this);
+ addEditPartListener(this);
}
}
@@ -110,4 +114,28 @@
}
}
+
+ public void childAdded(EditPart child, int index) {
+
+ }
+
+ public void partActivated(EditPart editpart) {
+
+ }
+
+ public void partDeactivated(EditPart editpart) {
+
+ }
+
+ public void removingChild(EditPart child, int index) {
+
+ }
+
+ public void selectedStateChanged(EditPart editpart) {
+ if (this.getSelected() == EditPart.SELECTED_PRIMARY) {
+ ((GEFRootEditPart) getParent()).setToFront(this);
+
+ }
+
+ }
}
\ No newline at end of file
18 years, 8 months
JBoss Tools SVN: r2924 - trunk/jst/features/org.jboss.tools.jst.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-06 19:10:59 -0400 (Mon, 06 Aug 2007)
New Revision: 2924
Modified:
trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
Log:
http://jira.jboss.com/jira/browse/EXIN-408
This plugin should be unpacked to define correct path to JBoss AS.
fixed.
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2007-08-06 21:25:51 UTC (rev 2923)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2007-08-06 23:10:59 UTC (rev 2924)
@@ -257,7 +257,6 @@
id="org.jboss.tools.jst.firstrun"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
</feature>
18 years, 8 months
JBoss Tools SVN: r2923 - in trunk/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: rob.stryker(a)jboss.com
Date: 2007-08-06 17:25:51 -0400 (Mon, 06 Aug 2007)
New Revision: 2923
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
allows facet to allert runtime when added
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-08-06 20:28:09 UTC (rev 2922)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-08-06 21:25:51 UTC (rev 2923)
@@ -32,7 +32,8 @@
org.eclipse.datatools.connectivity.db.generic,
org.eclipse.datatools.connectivity.db.generic.ui,
org.eclipse.datatools.connectivity.ui,
- org.eclipse.datatools.connectivity.ui.dse
+ org.eclipse.datatools.connectivity.ui.dse,
+ org.eclipse.jst.common.project.facet.core
Provide-Package: org.jboss.tools.seam.core,
org.jboss.tools.seam.internal.core,
org.jboss.tools.seam.internal.core.scanner,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-06 20:28:09 UTC (rev 2922)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-06 21:25:51 UTC (rev 2923)
@@ -12,7 +12,6 @@
import java.io.File;
import java.io.IOException;
-import java.text.MessageFormat;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
@@ -26,6 +25,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -36,9 +36,6 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamResourceVisitor;
-import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils.FileSet;
-import org.jboss.tools.seam.internal.core.project.facet.AntCopyUtils.FileSetFileFilter;
public class SeamFacetInstallDelegete extends Object implements IDelegate {
@@ -405,7 +402,7 @@
create.setRule(ResourcesPlugin.getWorkspace().getRoot());
create.schedule();
}
-
+ ClasspathHelper.addClasspathEntries(project, fv);
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
18 years, 8 months
JBoss Tools SVN: r2922 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-06 16:28:09 -0400 (Mon, 06 Aug 2007)
New Revision: 2922
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
Log:
dependency on generic server slipped in. now removed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2007-08-06 19:21:37 UTC (rev 2921)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2007-08-06 20:28:09 UTC (rev 2922)
@@ -13,8 +13,6 @@
org.eclipse.wst.server.core,
org.eclipse.wst.server.ui,
org.eclipse.wst.server.ui.doc.user,
- org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
org.eclipse.jdt.debug,
org.eclipse.jdt.debug.ui,
org.eclipse.ui.console,
18 years, 8 months
JBoss Tools SVN: r2921 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-06 15:21:37 -0400 (Mon, 06 Aug 2007)
New Revision: 2921
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
jsf jars added to web projects bc jsf facet does not tell people it is being added
plugin.xml updated to support newest facets
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-08-06 16:10:46 UTC (rev 2920)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-08-06 19:21:37 UTC (rev 2921)
@@ -22,6 +22,7 @@
package org.jboss.ide.eclipse.as.core.runtime.internal;
import java.util.ArrayList;
+import java.util.Arrays;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -150,7 +151,16 @@
protected IClasspathEntry getEntry(IPath path) {
return JavaRuntime.newArchiveRuntimeClasspathEntry(path).getClasspathEntry();
}
-
+ protected IClasspathEntry[] getEntries(IPath folder) {
+ String[] files = folder.toFile().list();
+ ArrayList list = new ArrayList();
+ for( int i = 0; i < files.length; i++ ) {
+ if( files[i].endsWith(".jar")) {
+ list.add(getEntry(folder.append(files[i])));
+ }
+ }
+ return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
+ }
protected IClasspathEntry[] loadJREClasspathEntries(AbstractJBossServerRuntime jbsRuntime) {
IVMInstall vmInstall = jbsRuntime.getVM();
if (vmInstall != null) {
@@ -166,8 +176,11 @@
IPath configPath = homePath.append("server").append(configName);
ArrayList list = new ArrayList();
if (facetId.equals(WEB_FACET.getId())) {
+ IPath jsfDir = configPath.append("deploy").append("jboss-web.deployer").append("jsf-libs");
list.add(getEntry(configPath.append("lib").append("jsp-api.jar")));
list.add(getEntry(homePath.append("client").append("servlet-api.jar")));
+ list.add(getEntry(jsfDir.append("jsf-api.jar")));
+ list.add(getEntry(jsfDir.append("jsf-impl.jar")));
} else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) {
list.add(getEntry(homePath.append("client").append("jboss-j2ee.jar")));
} else if( isEjb30(facetId, facetVersion)) {
@@ -204,8 +217,10 @@
IPath configPath = homePath.append("server").append(configName);
ArrayList list = new ArrayList();
if (facetId.equals(WEB_FACET.getId())) {
+ IPath jsfDir = configPath.append("deploy").append("jbossweb-tomcat55.sar").append("jsf-libs");
list.add(getEntry(configPath.append("lib").append("javax.servlet.jsp.jar")));
list.add(getEntry(homePath.append("client").append("javax.servlet.jar")));
+ list.addAll(Arrays.asList(getEntries(jsfDir)));
} else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) {
list.add(getEntry(homePath.append("client").append("jboss-j2ee.jar")));
} else if( isEjb30(facetId, facetVersion)) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-08-06 16:10:46 UTC (rev 2920)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-08-06 19:21:37 UTC (rev 2921)
@@ -108,10 +108,10 @@
version="4.0">
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4"/>
+ versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1"/>
+ versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
<moduleType
types="jst.ear"
versions="1.2, 1.3, 1.4"/>
@@ -151,13 +151,13 @@
version="1.0">
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4"/>
+ versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1"/>
+ versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
<moduleType
types="jst.ear"
- versions="1.2, 1.3, 1.4"/>
+ versions="1.2, 1.3, 1.4, 1.5"/>
<moduleType
types="jboss.package"
versions="1.0"/>
@@ -319,46 +319,24 @@
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component.40"
version="4.0"/>
- <facet
- id="jst.web"
- version="2.2,2.3,2.4"/>
+ <facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
<facet id="jst.java" version="1.3,1.4,5.0"/>
- <facet
- id="jst.utility"
- version="1.0"/>
- <facet
- id="jst.ejb"
- version="2.0,2.1"/>
- <facet
- id="jst.ear"
- version="1.2,1.3,1.4"/>
- <facet
- id="jst.appclient"
- version="1.2,1.3,1.4"/>
+ <facet id="jst.utility" version="1.0"/>
+ <facet id="jst.ejb" version="2.0,2.1,3.0"/>
+ <facet id="jst.ear" version="1.2,1.3,1.4"/>
+ <facet id="jst.appclient" version="1.2,1.3,1.4"/>
</supported>
<supported>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component.42"
version="4.2"/>
- <facet
- id="jst.web"
- version="2.2,2.3,2.4,2.5"/>
- <facet
- id="jst.java"
- version="1.3,1.4,5.0"/>
- <facet
- id="jst.utility"
- version="1.0"/>
- <facet
- id="jst.ejb"
- version="1.0,1.1,2.0,2.1,3.0"/>
- <facet
- id="jst.ear"
- version="1.2,1.3,1.4,5.0"/>
- <facet
- id="jst.appclient"
- version="1.2,1.3,1.4"/>
+ <facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
+ <facet id="jst.java" version="1.3,1.4,5.0"/>
+ <facet id="jst.utility" version="1.0"/>
+ <facet id="jst.ejb" version="2.0,2.1,3.0"/>
+ <facet id="jst.ear" version="1.2,1.3,1.4"/>
+ <facet id="jst.appclient" version="1.2,1.3,1.4"/>
</supported>
<adapter>
18 years, 8 months
JBoss Tools SVN: r2920 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-06 12:10:46 -0400 (Mon, 06 Aug 2007)
New Revision: 2920
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
JBIDE-662
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 2007-08-06 15:54:41 UTC (rev 2919)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-08-06 16:10:46 UTC (rev 2920)
@@ -812,12 +812,26 @@
}
static String getPackageName(ISeamComponent c) {
- String cls = c.getClassName();
+ // Package name can be based
+ // 1) on qualified java class name,
+ // then it is java package name
+ // 2) on seam component name,
+ // then name is processed by analogy with java,
+ // and package name is its part until the last dot.
+
+ // Presently, only second approach is implemented,
+ // in future an option can be added, that
+ // will allow user to customize view by selecting
+ // the 'kind' of packages.
+ String cls = c.getName();
+ //c.getClassName();
if(cls == null || cls.length() == 0) {
- return "<Unspecified>";
+ return "(unspecified)";
+ } else if(cls.startsWith("${") || cls.startsWith("#{")) {
+ return "(specified with EL)";
} else {
int d = cls.lastIndexOf('.');
- return (d < 0) ? "<default>" : cls.substring(0, d);
+ return (d < 0) ? "(default package)" : cls.substring(0, d);
}
}
18 years, 8 months