Author: dgolovin Date: 2008-09-11 19:47:33 -0400 (Thu, 11 Sep 2008) New Revision: 10210 Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/global/ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/vpe/ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/ Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 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/context/VpePageContext.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java Log: https://jira.jboss.org/jira/browse/JBIDE-2759 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210) @@ -5,10 +5,8 @@ Bundle-Name: El Plug-in Bundle-SymbolicName: org.jboss.tools.common.el.core Bundle-Version: 2.0.0 -Provide-Package: org.jboss.tools.common.el, - org.jboss.tools.common.el.global, - org.jboss.tools.common.el.vpe -Bundle-Activator: org.jboss.tools.common.el.Activator +Provide-Package: org.jboss.tools.common.el.core +Bundle-Activator: org.jboss.tools.common.el.core.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources, Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -1,50 +0,0 @@ -package org.jboss.tools.common.el; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.common.el"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -0,0 +1,50 @@ +package org.jboss.tools.common.el.core; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.common.el"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/vpe/ELReferenceList.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -0,0 +1,36 @@ +package org.jboss.tools.common.el.core; + + +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; + + +/** + * The Class ELReferenceList. + */ +public class ELReferenceList extends ResourceReferenceList { + + /** The PROPERT y_ NAME. */ + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); + + /** The instance. */ + static ELReferenceList instance = new ELReferenceList(); + + /** + * Gets the instance. + * + * @return the instance + */ + public static ELReferenceList getInstance() { + return instance; + } + + /** + * Gets the property name. + * + * @return the property name + */ + protected QualifiedName getPropertyName() { + return PROPERTY_NAME; + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -0,0 +1,51 @@ +/******************************************************************************* + * 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.common.el.core; + +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; + +/** + * @author Evgenij Stherbin + * + */ +public class GlobalELReferenceList extends ResourceReferenceList { + /** The PROPERT y_ NAME. */ + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference"); + + /** The instance. */ + private static GlobalELReferenceList instance = new GlobalELReferenceList(); + + /** + * Gets the instance. + * + * @return the instance + */ + public synchronized static GlobalELReferenceList getInstance() { + return instance; + } + + private GlobalELReferenceList() { + super(); + } + + /** + * Gets the property name. + * + * @return the property name + */ + protected QualifiedName getPropertyName() { + return PROPERTY_NAME; + } + + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -1,72 +0,0 @@ -package org.jboss.tools.common.el.ui; - -import java.util.List; - -import org.jboss.tools.common.el.vpe.ELReferenceList; -import org.jboss.tools.common.resref.core.ResourceReferenceList; -import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; -import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; - -/** - * The Class ElVariablesComposite. - */ -public class ElVariablesComposite extends AbstractResourceReferencesComposite { - - /** - * Creates the table provider. - * - * @param dataList the data list - * g - * @return the resource references table provider - */ - @Override - protected ResourceReferencesTableProvider createTableProvider(List dataList) { - return ResourceReferencesTableProvider.getELTableProvider(dataList); - }; - - - /** - * Gets the entity. - * - * @return the entity - */ - @Override - protected String getEntity() { - return (file != null) ? "VPEElReference" : "VPEElReferenceExt"; - } - - /**c - * Gets the reference list. - * - * @return the reference list - */ - @Override - protected ResourceReferenceList getReferenceList() { - return ELReferenceList.getInstance(); - } - - /** - * @see AbstractResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return Messages.SUBSTITUTED_EL_EXPRESSIONS; - } - - - @Override - protected void add(int index) { - // TODO Auto-generated method stub - - } - - - @Override - protected void edit(int index) { - // TODO Auto-generated method stub - - } - - - -} Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -13,7 +13,7 @@ import java.util.List; -import org.jboss.tools.common.el.global.GlobalELReferenceList; +import org.jboss.tools.common.el.core.GlobalELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.common.resref.core.ResourceReferenceList; import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; Deleted: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -1,39 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.common.el.ui; - -import org.eclipse.osgi.util.NLS; - -/** - * @author eskimo - * - */ -public class Messages { - - /** - * The resource bundle name. - * */ - private static final String BUNDLE_NAME = "org.jboss.tools.common.el.ui.messages";//$NON-NLS-1$ - - static { - // load message values from bundle file - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - /** - * The Constructor. - */ - private Messages(){} - - public static String SUBSTITUTED_EL_EXPRESSIONS; - -} Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -255,7 +255,7 @@ //ignore we cannot prevent this when project is removed externally } } catch (CoreException e) { - ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()"); + ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()", e); } finally { fsi.unlockUpdate(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -455,10 +455,6 @@ protected Layout getDefaultLayout() { GridLayout gridLayout = new GridLayout(2, false); - gridLayout.marginHeight = 10; - gridLayout.marginWidth = 10; - gridLayout.horizontalSpacing = 10; - gridLayout.verticalSpacing = 10; return gridLayout; } Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -81,13 +81,9 @@ } public Control createControl(Composite parent) { - Composite c1 = new Composite(parent, SWT.NONE); - c1.setLayoutData(new GridData(GridData.FILL_BOTH)); - c1.setLayout(new GridLayout(2,false)); + final Group group = new Group(parent,SWT.NONE); - final Group group = new Group(c1,SWT.NONE); - group.setText(createGroupLabel()); group.setLayoutData(new GridData(GridData.FILL_BOTH)); GridLayout g = new GridLayout(2, false); @@ -110,7 +106,7 @@ } }); update(); - return c1; + return group; } protected ResourceReference[] getReferenceArray() { @@ -133,7 +129,8 @@ getReferenceList().setAllResources(path, getReferenceArray()); } } - class BarListener implements CommandBarListener { + + public class BarListener implements CommandBarListener { public void action(String command) { int index = table.getSelectionIndex(); if(ADD.equals(command)) { @@ -169,10 +166,23 @@ updateBars(); } - void updateBars() { + protected void updateBars() { boolean canModify = table.getSelectionIndex() >= 0; bar.setEnabled(EDIT, canModify); bar.setEnabled(REMOVE, canModify); } + protected void initFilterInFileChooser() { + String entityName = getEntity(); + XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(entityName); + if(entity != null && file != null && file.getProject() != null) { + XAttribute[] as = entity.getAttributes(); + for (int i = 0; i < as.length; i++) { + if(as[i].getConstraint() instanceof XAttributeConstraintFileFilter) { + XAttributeConstraintFileFilter f = (XAttributeConstraintFileFilter)as[i].getConstraint(); + f.getProperties().setProperty("filterFolder", file.getProject().getLocation().toFile().getAbsolutePath()); + } + } + } + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -17,7 +17,7 @@ import java.util.Map.Entry; import org.eclipse.core.resources.IFile; -import org.jboss.tools.common.el.vpe.ELReferenceList; +import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.el.global.GlobalELReferenceList; +import org.jboss.tools.common.el.core.GlobalELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.CommonJBIDE2010Test; import org.jboss.tools.vpe.editor.util.ElService; Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -21,12 +21,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; -import org.jboss.tools.common.resref.core.RelativeFolderReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -16,12 +16,12 @@ import org.eclipse.core.resources.IFile; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.part.FileEditorInput; -import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; import org.mozilla.interfaces.nsIDOMDocument; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210) @@ -74,7 +74,6 @@ org.jboss.tools.jst.web, org.jboss.tools.vpe.resref, org.jboss.tools.common.el.core, - org.jboss.tools.common.el.ui, - org.jboss.tools.common.resref.ui + org.jboss.tools.common.el.ui Bundle-Version: 2.1.0 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-09-11 23:47:33 UTC (rev 10210) @@ -28,8 +28,8 @@ /> </extension> <extension point="org.jboss.tools.common.model.classes"> - <xclass id="org.jboss.tools.common.resref.core.VpeAddReferenceSupport" - class="org.jboss.tools.common.resref.core.VpeAddReferenceSupport"/> + <xclass id="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport" + class="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"/> </extension> <extension point="org.eclipse.ui.preferencePages"> <page category="org.jboss.tools.common.xstudio.editors" class="org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage" id="org.jboss.tools.vpe.editor" name="Visual Page Editor"></page> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -86,7 +86,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.jboss.tools.common.el.vpe.ELReferenceList; +import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; @@ -107,11 +107,7 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.ModelFeatureFactory; import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync; -import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList; -import org.jboss.tools.common.resref.core.CSSReferenceList; -import org.jboss.tools.common.resref.core.RelativeFolderReferenceList; import org.jboss.tools.common.resref.core.ResourceReferenceListListener; -import org.jboss.tools.common.resref.core.TaglibReferenceList; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.preferences.VpePreference; @@ -149,6 +145,10 @@ import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.jboss.tools.vpe.editor.util.VpeDndUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; +import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; +import org.jboss.tools.vpe.resref.core.CSSReferenceList; +import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList; +import org.jboss.tools.vpe.resref.core.TaglibReferenceList; import org.jboss.tools.vpe.selbar.SelectionBar; import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; 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 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -43,7 +43,6 @@ 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.common.resref.core.CSSReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; @@ -76,6 +75,7 @@ import org.jboss.tools.vpe.editor.util.TextUtil; import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.jboss.tools.vpe.editor.util.VpeStyleUtil; +import org.jboss.tools.vpe.resref.core.CSSReferenceList; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMAttr; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -29,11 +29,7 @@ import org.jboss.tools.common.kb.KbConnectorType; import org.jboss.tools.common.kb.KbException; import org.jboss.tools.common.kb.wtp.WtpKbConnector; -import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList; -import org.jboss.tools.common.resref.core.CSSReferenceList; -import org.jboss.tools.common.resref.core.RelativeFolderReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; -import org.jboss.tools.common.resref.core.TaglibReferenceList; import org.jboss.tools.jst.jsp.editor.IVisualContext; import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.TaglibData; @@ -47,6 +43,10 @@ import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.XmlUtil; +import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; +import org.jboss.tools.vpe.resref.core.CSSReferenceList; +import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList; +import org.jboss.tools.vpe.resref.core.TaglibReferenceList; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; -import org.jboss.tools.common.el.global.GlobalELReferenceList; -import org.jboss.tools.common.el.vpe.ELReferenceList; +import org.jboss.tools.common.el.core.ELReferenceList; +import org.jboss.tools.common.el.core.GlobalELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.vpe.editor.bundle.BundleMap; import org.jboss.tools.vpe.editor.context.VpePageContext; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -33,10 +33,10 @@ 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.common.resref.core.AbsoluteFolderReferenceList; -import org.jboss.tools.common.resref.core.RelativeFolderReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList; +import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList; public class FileUtil { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -15,17 +15,18 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.jboss.tools.common.el.ui.ElVariablesComposite; import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView; -import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceComposite; -import org.jboss.tools.common.resref.core.CssReferencesComposite; -import org.jboss.tools.common.resref.core.RelativeFolderReferenceComposite; -import org.jboss.tools.common.resref.core.TaglibReferencesComposite; +import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceComposite; +import org.jboss.tools.vpe.resref.core.CssReferencesComposite; +import org.jboss.tools.vpe.resref.core.ElVariablesComposite; +import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceComposite; +import org.jboss.tools.vpe.resref.core.TaglibReferencesComposite; public class VpeResourcesDialogView extends AbstractQueryWizardView { IFile file; @@ -57,30 +58,15 @@ GridData data; Composite c = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(1, false); - layout.marginWidth = 0; + layout.marginWidth = 5; layout.marginHeight = 0; c.setLayout(layout); - + c.setBackground(new Color(c.getDisplay(),0,0,0)); Control absControl = absFolder.createControl(c); - data = new GridData(GridData.FILL_HORIZONTAL); - absControl.setLayoutData(data); - Control relControl = relFolder.createControl(c); - data = new GridData(GridData.FILL_HORIZONTAL); - relControl.setLayoutData(data); - Control cssControl = css.createControl(c); - data = new GridData(GridData.FILL_BOTH); - cssControl.setLayoutData(data); Control tldControl = tld.createControl(c); - data = new GridData(GridData.FILL_BOTH); - tldControl.setLayoutData(data); - - //changed by estherbin - //http://jira.jboss.com/jira/browse/JBIDE-2010 Control elControl = el.createControl(c); - data = new GridData(GridData.FILL_BOTH); - elControl.setLayoutData(data); return c; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210) @@ -5,16 +5,16 @@ Bundle-SymbolicName: org.jboss.tools.vpe.resref;singleton:=true Bundle-Version: 2.0.0 Bundle-ManifestVersion: 2 -Bundle-Activator: org.jboss.tools.common.resref.Activator +Bundle-Activator: org.jboss.tools.vpe.resref.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.common.model.ui, org.eclipse.core.resources, org.jboss.tools.jst.web, org.jboss.tools.common.resref.core;bundle-version="1.0.0", - org.jboss.tools.common.resref.ui;bundle-version="1.0.0" + org.jboss.tools.common.resref.ui;bundle-version="1.0.0";visibility:=reexport, + org.jboss.tools.common.el.core;bundle-version="2.0.0" Eclipse-LazyStart: true -Export-Package: org.jboss.tools.common.resref, - org.jboss.tools.common.resref.core, - org.jboss.tools.common.resref.messages +Export-Package: org.jboss.tools.vpe.resref, + org.jboss.tools.vpe.resref.core Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java 2008-09-11 23:46:32 UTC (rev 10209) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -1,50 +0,0 @@ -package org.jboss.tools.common.resref; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.common.resref"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java (from rev 10080, trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java 2008-09-11 23:47:33 UTC (rev 10210) @@ -0,0 +1,50 @@ +package org.jboss.tools.vpe.resref; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.common.resref"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java ___________________________________________________________________ Name: svn:mime-type + text/plain