JBoss Tools SVN: r3446 - in trunk/seam/tests/org.jboss.tools.seam.ui.test: src/org/jboss/tools/seam/ui/test/view and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-04 12:55:26 -0400 (Tue, 04 Sep 2007)
New Revision: 3446
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 2007-09-04 16:55:26 UTC (rev 3446)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd">
+ <component class="java.lang.Boolean" name="myComponent" scope="page">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+ <component class="java.lang.String" name="myPackage.myStringComponent" scope="application">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+ <core:managed-persistence-context name="myPersistenceContext1"/>
+
+ <core:resource-bundle>
+ <core:bundle-names>
+ <value>bundleA</value>
+ <value>bundleB</value>
+ </core:bundle-names>
+ </core:resource-bundle>
+
+ <core:manager
+ conversation-is-long-running-parameter="a"
+ parent-conversation-id-parameter="b"
+ conversation-id-parameter="c"
+ concurrent-request-timeout="2"
+ conversation-timeout="3"
+ />
+
+ <factory name="factory1" scope="conversation"/>
+
+</components>
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 2007-09-04 16:55:26 UTC (rev 3446)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd">
+ <component class="java.lang.Boolean" name="myComponent" scope="page">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+ <core:managed-persistence-context name="myPersistenceContext1"/>
+
+ <core:resource-bundle>
+ <core:bundle-names>
+ <value>bundleA</value>
+ <value>bundleB</value>
+ </core:bundle-names>
+ </core:resource-bundle>
+
+ <core:manager
+ conversation-is-long-running-parameter="a"
+ parent-conversation-id-parameter="b"
+ conversation-id-parameter="c"
+ concurrent-request-timeout="2"
+ conversation-timeout="3"
+ />
+
+ <factory name="factory1" scope="conversation"/>
+
+</components>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-04 16:42:10 UTC (rev 3445)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-04 16:55:26 UTC (rev 3446)
@@ -11,19 +11,26 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.view;
+import java.io.FileInputStream;
+import java.io.InputStream;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IViewPart;
@@ -34,7 +41,9 @@
import org.jboss.tools.jst.web.ui.RedHat4WebPerspectiveFactory;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamPackage;
+import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamScope;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.ui.ISeamUiConstants;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.WorkbenchUtils;
@@ -45,7 +54,7 @@
*
*/
public class SeamComponentsViewTest extends TestCase {
-
+ IProject project;
@Override
protected void setUp() throws Exception {
@@ -53,40 +62,111 @@
WorkbenchUtils.getWorkbench().showPerspective(
RedHat4WebPerspectiveFactory.PERSPECTIVE_ID,
WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow());
- }
-
- public void testComponentViewTree(){
- System.out.println("testAComponentViewTree!");
TestProjectProvider provider=null;
try {
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, "TestComponentView", true);
} catch (Exception e1) {
JUnitUtils.fail("Cannot create Project Provider", e1);
}
- IProject project = provider.getProject();
+ project = provider.getProject();
+ }
+
+ public void testComponentView(){
+ addComponent();
+ deleteComponent();
+ }
+
+ public void addComponent(){
+ SeamCorePlugin.getSeamProject(project, true);
+
try {
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
} catch (Exception e) {
- JUnitUtils.fail("Cannot refresh created test Project", e);
+ JUnitUtils.fail("Cannot build test Project", e);
}
+
+ IFile file = project.getFile("WebContent/WEB-INF/components.xml");
+ assertTrue("Cannot find components.xml in test project", file != null && file.exists());
+
+ CommonNavigator navigator = getSeamComponentsView();
+ navigator.getCommonViewer().expandAll();
+
+ Tree tree = navigator.getCommonViewer().getTree();
+
+ ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" found!",seamPackage==null);
+
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.1");
+ assertTrue("Cannot find components.1 in test project", file1 != null && file1.exists());
+
+ try{
+ file.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ }catch(Exception ex){
+ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.1", ex);
+ }
+
try {
- XJob.waitForJob();
- } catch (InterruptedException e) {
- JUnitUtils.fail(e.getMessage(),e);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot build test Project", e);
}
- System.out.println("Refresh is DONE!");
- IFile f = project.getFile("WebContent/WEB-INF/components.xml");
- assertTrue("Cannot find components.xml in test project", f != null && f.exists());
+ seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+ if(seamPackage != null){
+ ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
+ assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
+ }
+
+ }
+
+ public void deleteComponent(){
+
+ IFile file = project.getFile("WebContent/WEB-INF/components.xml");
+ assertTrue("Cannot find components.xml in test project", file != null && file.exists());
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
+
Tree tree = navigator.getCommonViewer().getTree();
System.out.println("tree.getItemCount() - "+tree.getItemCount());
for(int i=0;i<tree.getItemCount();i++){
showTreeItem(tree.getItem(i),0);
}
+
+ ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+
+ if(seamPackage != null){
+ ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
+ assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
+ }
+
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
+ assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
+
+ try{
+ file.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ }catch(Exception ex){
+ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
+ }
+
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot build test Project", e);
+ }
+
+ System.out.println("tree.getItemCount() - "+tree.getItemCount());
+ for(int i=0;i<tree.getItemCount();i++){
+ showTreeItem(tree.getItem(i),0);
+ }
+
+ seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" found!",seamPackage==null);
+
}
/**
@@ -111,11 +191,11 @@
} catch (Exception e) {
JUnitUtils.fail("Cannot refresh created test Project", e);
}
- try {
+ /*try {
XJob.waitForJob();
} catch (InterruptedException e) {
JUnitUtils.fail(e.getMessage(),e);
- }
+ }*/
IStructuredContentProvider content
= (IStructuredContentProvider)getSeamComponentsView().getCommonViewer().getContentProvider();
assertTrue("Created Seam enabled project haven't been shown in tree",1==content.getElements(ResourcesPlugin.getWorkspace().getRoot()).length);
@@ -146,39 +226,92 @@
System.out.print("-");
System.out.print(item.getText());
- System.out.println(" "+item.getData());
+ System.out.println("Item "+item.getData());
if(item.getData() instanceof ISeamScope){
ISeamScope scope = (ISeamScope)item.getData();
- Collection packages = scope.getPackages();
- System.out.println(" packages - "+packages.size());
- Iterator iter = packages.iterator();
+ Iterator<ISeamPackage> iter = scope.getAllPackages().iterator();
while(iter.hasNext())
- showSeamPackage((ISeamPackage)iter.next(), level++);
+ showSeamPackage(iter.next(), level+1);
- List components = scope.getComponents();
+ List<ISeamComponent> components = scope.getComponents();
for(int i=0;i<components.size();i++)
- showSeamComponent((ISeamComponent)components.get(i), level++);
+ showSeamComponent(components.get(i), level+1);
}
for(int i=0;i<item.getItemCount();i++){
- showTreeItem(item.getItem(i),level++);
+ showTreeItem(item.getItem(i),level+1);
}
}
-
- private void showSeamComponent(ISeamComponent component, int level){
+
+ private void showSeamPackage(ISeamPackage seamPackage, int level){
for(int i=0;i<level;i++)
System.out.print("-");
- System.out.println("Component - "+component.getName());
+ System.out.println("Package - "+seamPackage.getName()+" "+seamPackage.getQualifiedName());
+ Iterator<ISeamComponent> iter = seamPackage.getComponents().iterator();
+ while(iter.hasNext())
+ showSeamComponent(iter.next(), level+1);
}
- private void showSeamPackage(ISeamPackage seamPackage, int level){
+ private void showSeamComponent(ISeamComponent component, int level){
for(int i=0;i<level;i++)
System.out.print("-");
- System.out.println("Package - "+seamPackage.getName());
+ System.out.println("Component - "+component.getName()+" "+component.getClassName());
+ }
+
+ private ISeamComponent findSeamComponent(ISeamPackage seamPackage, String name){
+ ISeamComponent component=null;
+ Iterator<ISeamComponent> iter = seamPackage.getComponents().iterator();
+ while(iter.hasNext()){
+ component = iter.next();
+ if(component.getName().equals(name)) return component;
+ }
+
+ return null;
}
+
+ private ISeamPackage findSeamPackage(ISeamScope seamScope, String name){
+ ISeamPackage seamPackage=null;
+
+ Iterator<ISeamPackage> iter = seamScope.getAllPackages().iterator();
+ while(iter.hasNext()){
+ seamPackage = iter.next();
+ if(seamPackage.getName().equals(name)) return seamPackage;
+ }
+
+ return null;
+ }
+
+ private ISeamPackage findSeamPackage(TreeItem item, String name){
+ ISeamPackage seamPackage=null;
+
+ if(item.getData() instanceof ISeamScope){
+ seamPackage = findSeamPackage((ISeamScope)item.getData(), name);
+ if(seamPackage != null) return seamPackage;
+ }
+ for(int i=0;i<item.getItemCount();i++){
+ seamPackage = findSeamPackage(item.getItem(i), name);
+ if(seamPackage != null) return seamPackage;
+ }
+
+ return null;
+ }
+
+ private ISeamPackage findSeamPackage(Tree tree, String name){
+ ISeamPackage seamPackage=null;
+ TreeItem item;
+
+ for(int i=0;i<tree.getItemCount();i++){
+ item = tree.getItem(i);
+ seamPackage = findSeamPackage(item, name);
+ if(seamPackage != null) return seamPackage;
+ }
+
+ return null;
+ }
+
}
16 years, 8 months
JBoss Tools SVN: r3445 - trunk/core/plugins/org.jboss.ide.eclipse.archives.core/schema.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-04 12:42:10 -0400 (Tue, 04 Sep 2007)
New Revision: 3445
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/schema/archiveTypes.exsd
Log:
max numbber of archiveTypes should be unbounded
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/schema/archiveTypes.exsd
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/schema/archiveTypes.exsd 2007-09-04 13:32:24 UTC (rev 3444)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/schema/archiveTypes.exsd 2007-09-04 16:42:10 UTC (rev 3445)
@@ -13,7 +13,7 @@
<element name="extension">
<complexType>
<sequence>
- <element ref="packageType"/>
+ <element ref="packageType" minOccurs="1" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
16 years, 8 months
JBoss Tools SVN: r3444 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 09:32:24 -0400 (Tue, 04 Sep 2007)
New Revision: 3444
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsTreeListener.java
Log:
JBIDE-565
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsTreeListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsTreeListener.java 2007-09-04 13:32:04 UTC (rev 3443)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsTreeListener.java 2007-09-04 13:32:24 UTC (rev 3444)
@@ -12,6 +12,7 @@
import java.util.*;
import org.jboss.tools.common.model.ui.navigator.TreeViewerModelListenerImpl;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.TreeViewer;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
@@ -21,8 +22,8 @@
public class WebProjectsTreeListener extends TreeViewerModelListenerImpl {
static String[][] LISTENERS = new String[][]{
- {WebProject.JSF_NATURE_ID, "org.jboss.tools.jsf.ui.navigator.JsfProjectsTreeListener"},
- {WebProject.STRUTS_NATURE_ID, "org.jboss.tools.struts.ui.navigator.StrutsProjectsTreeListener"}
+ {WebProject.JSF_NATURE_ID, "org.jboss.tools.jsf.ui.navigator.JsfProjectsTreeListener", "org.jboss.tools.jsf.ui"},
+ {WebProject.STRUTS_NATURE_ID, "org.jboss.tools.struts.ui.navigator.StrutsProjectsTreeListener", "org.jboss.tools.struts.ui"}
};
Map<String,TreeViewerModelListenerImpl> listeners = new HashMap<String,TreeViewerModelListenerImpl>();
@@ -30,8 +31,13 @@
for (int i = 0; i < LISTENERS.length; i++) {
String nature = LISTENERS[i][0];
String classname = LISTENERS[i][1];
+ String plugin = LISTENERS[i][2];
+ if(Platform.getBundle(plugin) == null) {
+ continue;
+ }
try {
TreeViewerModelListenerImpl impl = (TreeViewerModelListenerImpl)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
+ if(impl == null) continue;
listeners.put(nature, impl);
} catch (Exception e) {
WebUiPlugin.getPluginLog().logError(e);
16 years, 8 months
JBoss Tools SVN: r3443 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 09:32:04 -0400 (Tue, 04 Sep 2007)
New Revision: 3443
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
Log:
JBIDE-565
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-09-04 12:51:59 UTC (rev 3442)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-09-04 13:32:04 UTC (rev 3443)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.browser.IWebBrowser;
@@ -29,7 +30,6 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.plugin.ModelPlugin;
-import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.jst.web.WebModelPlugin;
@@ -40,20 +40,25 @@
public class RunOnServerContext extends AbstractBrowserContext {
static RunOnServerContext instance = new RunOnServerContext();
- static String[] pathSources = new String[]{
- "org.jboss.tools.jst.web.model.handlers.RunOnServerHandler", //$NON-NLS-1$
- "org.jboss.tools.struts.model.handlers.page.RunOnServerHandler", //$NON-NLS-1$
- "org.jboss.tools.jsf.model.handlers.run.RunOnServerHandler" //$NON-NLS-1$
+ static String[][] pathSources = new String[][]{
+ {"org.jboss.tools.jst.web.model.handlers.RunOnServerHandler", "org.jboss.tools.jst.web"},
+ {"org.jboss.tools.struts.model.handlers.page.RunOnServerHandler", "org.jboss.tools.struts"},
+ {"org.jboss.tools.jsf.model.handlers.run.RunOnServerHandler", "org.jboss.tools.jsf"}
};
public void init() {
if(inited) return;
inited = true;
//causes delegating IPathSource to RunOnServerContext
- //this is temporal implementation
+ //this implementation imitates extension point
for (int i = 0; i < pathSources.length; i++) {
+ String plugin = pathSources[i][1];
+ if(Platform.getBundle(plugin) == null) {
+ continue;
+ }
+ String classname = pathSources[i][0];
try {
- ModelFeatureFactory.getInstance().createFeatureInstance(pathSources[i]);
+ ModelFeatureFactory.getInstance().createFeatureInstance(classname);
} catch (Exception e) {
WebModelPlugin.getPluginLog().logError(e);
}
16 years, 8 months
JBoss Tools SVN: r3442 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: ayukhovich
Date: 2007-09-04 08:51:59 -0400 (Tue, 04 Sep 2007)
New Revision: 3442
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-623
add functionality for resolve this issue
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-04 10:49:46 UTC (rev 3441)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-04 12:51:59 UTC (rev 3442)
@@ -24,6 +24,7 @@
import java.util.regex.Pattern;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -33,7 +34,12 @@
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.eclipse.wst.xml.core.internal.document.NodeImpl;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.vpe.VpeDebug;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.bundle.BundleMap;
@@ -156,7 +162,7 @@
unborderedVisualNodes.add(TAG_BR);
}
private VpeDnd dropper;
-
+ private boolean faceletFile;
public VpeVisualDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) {
super(domMapping, sorceAdapter, templateManager);
@@ -169,6 +175,12 @@
this.headNode = visualEditor.getHeadNode();
dropper = new VpeDnd();
dropper.setDndData(false, true);
+
+ if ( isFacelet() ) {
+ faceletFile = true;
+ } else {
+ faceletFile = false;
+ }
}
public void buildDom(Document sourceDocument) {
@@ -381,16 +393,17 @@
registerNodes(new VpeNodeMapping(sourceNode, null));
return null;
}
- /*
- Matcher matcher_EL = REGEX_EL.matcher(sourceText);
- if (matcher_EL.find()) {
- BundleMap bundle = pageContext.getBundle();
- int offset = pageContext.getVisualBuilder().getCurrentMainIncludeOffset();
- if (offset == -1) offset = ((IndexedRegion)sourceNode).getStartOffset();
- String jsfValue = bundle.getBundleValue(sourceText, offset);
- sourceText = jsfValue;
+
+ if (faceletFile) {
+ Matcher matcher_EL = REGEX_EL.matcher(sourceText);
+ if (matcher_EL.find()) {
+ BundleMap bundle = pageContext.getBundle();
+ int offset = pageContext.getVisualBuilder().getCurrentMainIncludeOffset();
+ if (offset == -1) offset = ((IndexedRegion)sourceNode).getStartOffset();
+ String jsfValue = bundle.getBundleValue(sourceText, offset);
+ sourceText = jsfValue;
+ }
}
-*/
String visualText = TextUtil.visualText(sourceText);
Node visualNewTextNode = visualDocument.createTextNode(visualText);
@@ -1674,4 +1687,35 @@
pageContext.setTaglib(attr.hashCode(), attr.getNodeValue(), attr.getLocalName(), ns);
}
}
+
+ /**
+ * Check this file is facelet
+ * @return this if file is facelet, otherwize false
+ */
+ private boolean isFacelet() {
+ boolean isFacelet = false;
+
+ IEditorInput iEditorInput = pageContext.getEditPart().getEditorInput();
+ if ( iEditorInput instanceof IFileEditorInput ) {
+ IFileEditorInput iFileEditorInput = (IFileEditorInput) iEditorInput;
+
+ IFile iFile = iFileEditorInput.getFile();
+
+ IProject project = iFile.getProject();
+ IModelNature nature = EclipseResourceUtil.getModelNature(project);
+ XModel model = nature.getModel();
+ XModelObject webXML = WebAppHelper.getWebApp(model);
+ XModelObject param = WebAppHelper.findWebAppContextParam(webXML, "javax.faces.DEFAULT_SUFFIX");
+ if ( param != null ) {
+ String value = param.getAttributeValue("param-value");
+
+ if ( value.length() != 0 && iFile.getName().endsWith(value)) {
+ isFacelet = true;
+ }
+ }
+
+ }
+
+ return isFacelet;
+ }
}
16 years, 8 months
JBoss Tools SVN: r3441 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 06:49:46 -0400 (Tue, 04 Sep 2007)
New Revision: 3441
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
Log:
JBIDE-351
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2007-09-04 10:47:44 UTC (rev 3440)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsGenerator.java 2007-09-04 10:49:46 UTC (rev 3441)
@@ -212,19 +212,16 @@
StrutsModelPlugin.getPluginLog().logError(rnfe);
d.showDialog(StrutsUIMessages.ERROR, rnfe.getMessage(), new String[]{StrutsUIMessages.OK}, null, ServiceDialog.ERROR);
/// ErrorDialog.openError(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),rnfe);
- //rnfe.printStackTrace();
} catch (ParseErrorException pee) {
StrutsModelPlugin.getPluginLog().logError(pee);
d.showDialog(StrutsUIMessages.ERROR, pee.getMessage(), new String[]{StrutsUIMessages.OK}, null, ServiceDialog.ERROR);
/// ErrorDialog.openError(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),pee);
- //pee.printStackTrace();
}
} catch (Exception e) {
StrutsModelPlugin.getPluginLog().logError(e);
d.showDialog(StrutsUIMessages.ERROR, e.getMessage(), new String[]{StrutsUIMessages.OK}, null, ServiceDialog.ERROR);
/// ErrorDialog.openError(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),e);
- //e.printStackTrace();
}
};
16 years, 8 months
JBoss Tools SVN: r3440 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 06:47:44 -0400 (Tue, 04 Sep 2007)
New Revision: 3440
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java
Log:
JBIDE-351
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-09-04 10:44:28 UTC (rev 3439)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-09-04 10:47:44 UTC (rev 3440)
@@ -22,6 +22,7 @@
import org.eclipse.ui.navigator.IExtensionActivationListener;
import org.eclipse.ui.navigator.IExtensionStateModel;
import org.eclipse.ui.navigator.INavigatorActivationService;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.ui.views.ViewConstants;
@@ -121,7 +122,7 @@
try {
getActionSite().getStructuredViewer().refresh();
} catch (Exception e2) {
- e2.printStackTrace();
+ SeamCorePlugin.getPluginLog().logError(e2);
//ignore
}
}
16 years, 8 months
JBoss Tools SVN: r3439 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 06:44:28 -0400 (Tue, 04 Sep 2007)
New Revision: 3439
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
Log:
JBIDE-351
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2007-09-04 10:40:01 UTC (rev 3438)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2007-09-04 10:44:28 UTC (rev 3439)
@@ -109,7 +109,7 @@
try {
getProject().accept(getResourceVisitor().getVisitor());
} catch (CoreException e) {
- e.printStackTrace();
+ SeamCorePlugin.getPluginLog().logError(e);
}
}
16 years, 8 months
JBoss Tools SVN: r3438 - in trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp: text/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 06:40:01 -0400 (Tue, 04 Sep 2007)
New Revision: 3438
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/preferences/xpl/XMLOccurrencesPreferencePage.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java
Log:
JBIDE-351
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/preferences/xpl/XMLOccurrencesPreferencePage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/preferences/xpl/XMLOccurrencesPreferencePage.java 2007-09-04 10:30:40 UTC (rev 3437)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/preferences/xpl/XMLOccurrencesPreferencePage.java 2007-09-04 10:40:01 UTC (rev 3438)
@@ -146,7 +146,7 @@
sticky.offset(getFieldEditorParent(), 10); // offset 10
addField(sticky);
} catch (Exception x) {
- x.printStackTrace();
+ XmlEditorPlugin.getPluginLog().logError(x);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java 2007-09-04 10:30:40 UTC (rev 3437)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/jst/jsp/text/xpl/DefaultStructuredTextOccurrenceStructureProvider.java 2007-09-04 10:40:01 UTC (rev 3438)
@@ -584,7 +584,7 @@
return findTextMatches(dom, xmlText.getData().trim());
}
} catch (Exception x) {
-// x.printStackTrace();
+ XmlEditorPlugin.getPluginLog().logError(x);
}
return new ArrayList();
}
16 years, 8 months
JBoss Tools SVN: r3437 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-04 06:30:40 -0400 (Tue, 04 Sep 2007)
New Revision: 3437
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
Log:
JBIDE-351
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-09-04 10:26:53 UTC (rev 3436)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-09-04 10:30:40 UTC (rev 3437)
@@ -141,7 +141,7 @@
try {
p.parse(stream);
} catch (Exception e) {
- e.printStackTrace();
+ ModelPlugin.getPluginLog().logError(e);
}
Element g = p.documentElement;
g = XMLUtilities.getUniqueChild(g, "XModelEntityGroup");
@@ -222,7 +222,7 @@
try {
parser.parse(is);
} catch (Exception e) {
- e.printStackTrace();
+ ModelPlugin.getPluginLog().logError(e);
}
}
16 years, 8 months