[jbosstools-commits] JBoss Tools SVN: r9902 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/editor/el and 4 other directories.

Author: estherbin Date: 2008-08-26 10:17:01 -0400 (Tue, 26 Aug 2008) New Revision: 9902 Removed: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ELReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ElVariablesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalELReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalElVariablesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/Messages.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/messages.properties trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CSSReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CssReferencesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/FolderReferenceComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/GlobalResourceReference.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReference.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceListListener.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesTableProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferenceList.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferencesComposite.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/VpeAddReferenceSupport.java Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/DnDUtil.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropCommandFactory.java Log: Move configuration for el substitution to the another bundle. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/META-INF/MANIFEST.MF 2008-08-26 14:17:01 UTC (rev 9902) @@ -113,10 +113,5 @@ org.eclipse.ant.ui, org.eclipse.core.expressions, org.eclipse.core.filesystem, - org.jboss.tools.vpe.xulrunner, - org.eclipse.wst.html.core, - org.mozilla.xpcom, - org.jboss.tools.jst.web + org.eclipse.wst.html.core Bundle-Version: 2.0.0 -Export-Package: org.jboss.tools.common.editor.el, - org.jboss.tools.common.editor.rreferences Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ELReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ELReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,38 +0,0 @@ - - -package org.jboss.tools.common.editor.el; - - -import org.eclipse.core.runtime.QualifiedName; -import org.jboss.tools.common.editor.rreferences.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; - } -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ElVariablesComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/ElVariablesComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,58 +0,0 @@ -package org.jboss.tools.common.editor.el; - -import java.util.List; - -import org.jboss.tools.common.editor.messages.Messages; -import org.jboss.tools.common.editor.rreferences.ResourceReferenceList; -import org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite; -import org.jboss.tools.common.editor.rreferences.ResourceReferencesTableProvider; - -/** - * The Class ElVariablesComposite. - */ -public class ElVariablesComposite extends ResourceReferencesComposite { - - /** - * 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 ResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return Messages.SUBSTITUTED_EL_EXPRESSIONS; - } - - - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalELReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalELReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,51 +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.editor.el; - -import org.eclipse.core.runtime.QualifiedName; -import org.jboss.tools.common.editor.rreferences.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; - } - - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalElVariablesComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/el/GlobalElVariablesComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,68 +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.editor.el; - -import java.util.List; - -import org.jboss.tools.common.editor.rreferences.ResourceReference; -import org.jboss.tools.common.editor.rreferences.ResourceReferenceList; -import org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite; -import org.jboss.tools.common.editor.rreferences.ResourceReferencesTableProvider; - - -/** - * Composite class for the global el variables. - * @author Evgenij Stherbin - * - */ -public class GlobalElVariablesComposite extends ResourceReferencesComposite { - - /** - * @see org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return ""; - } - - /** - * @see org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite#createTableProvider(java.util.List) - */ - @Override - protected ResourceReferencesTableProvider createTableProvider(List dataList) { - return ResourceReferencesTableProvider.getGlobalELTableProvider(dataList); - } - - /** - * @see org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite#getEntity() - */ - @Override - protected String getEntity() { - return (file != null) ? "VPEGlobalElReference" : "VPEGlobalElReferenceExt"; - } - - /** - * @see org.jboss.tools.common.editor.rreferences.ResourceReferencesComposite#getReferenceList() - */ - @Override - protected ResourceReferenceList getReferenceList() { - return GlobalELReferenceList.getInstance(); - } - - @Override - protected ResourceReference getDefaultResourceReference() { - ResourceReference rf = new ResourceReference("", ResourceReference.GLOBAL_SCOPE); - rf.setGlobal(true); - return rf; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/Messages.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/Messages.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,44 +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.editor.messages; - - -import org.eclipse.osgi.util.NLS; - - -/** - * The Class Messages. - * - * @author Evgenij Stherbin - */ -public class Messages extends NLS { - - /** The Constant BUNDLE_NAME. */ - private static final String BUNDLE_NAME = "org.jboss.tools.common.editor.messages.messages";//$NON-NLS-1$ - - static { - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - /** - * The Constructor. - */ - private Messages() { - super(); - } - - public static String INCLUDED_CSS_FILES; - public static String INCLUDED_TAG_LIBS; - public static String SUBSTITUTED_EL_EXPRESSIONS; - public static String ACTUAL_RUN_TIME_ABSOLUTE_FOLDER; -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/messages.properties 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/messages/messages.properties 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,4 +0,0 @@ -INCLUDED_CSS_FILES=Included css files -INCLUDED_TAG_LIBS=Included tag libs -SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions -ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.jboss.tools.common.editor.messages.Messages; - -public class AbsoluteFolderReferenceComposite extends FolderReferenceComposite { - - protected ResourceReferenceList getReferenceList() { - return AbsoluteFolderReferenceList.getInstance(); - } - - protected String getTitle() { - return Messages.ACTUAL_RUN_TIME_ABSOLUTE_FOLDER; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/AbsoluteFolderReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.eclipse.core.runtime.QualifiedName; - -public class AbsoluteFolderReferenceList extends ResourceReferenceList { - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.AbsoluteFolder"); - static AbsoluteFolderReferenceList instance = new AbsoluteFolderReferenceList(); - - public static AbsoluteFolderReferenceList getInstance() { - return instance; - } - - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CSSReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CSSReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CSSReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.eclipse.core.runtime.QualifiedName; - -public class CSSReferenceList extends ResourceReferenceList { - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.CSSList"); - static CSSReferenceList instance = new CSSReferenceList(); - - public static CSSReferenceList getInstance() { - return instance; - } - - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CssReferencesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CssReferencesComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/CssReferencesComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.List; - -import org.jboss.tools.common.editor.messages.Messages; - -public class CssReferencesComposite extends ResourceReferencesComposite { - - protected String getEntity() { - return (file != null) ? "VPECSSReference" : "VPECSSReferenceExt"; - } - - protected ResourceReferencesTableProvider createTableProvider(List dataList) { - return ResourceReferencesTableProvider.getCSSTableProvider(dataList); - } - - protected ResourceReferenceList getReferenceList() { - return CSSReferenceList.getInstance(); - } - - - /** - * @see ResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return Messages.INCLUDED_CSS_FILES; - } - - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/FolderReferenceComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/FolderReferenceComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/FolderReferenceComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; -import org.jboss.tools.common.model.ui.attribute.XAttributeSupport; -import org.jboss.tools.common.model.ui.attribute.editor.DirectoryFieldEditorEx; -import org.eclipse.swt.SWT; -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.eclipse.swt.widgets.Group; -import org.jboss.tools.common.meta.action.XEntityData; -import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; - -public abstract class FolderReferenceComposite { - XAttributeSupport support = new XAttributeSupport(); - XModelObject object; - IFile file; - IPath path; - ResourceReference[] rs; - ResourceReference current; - XEntityData data; - - public FolderReferenceComposite() { - object = PreferenceModelUtilities.getPreferenceModel().createModelObject(getEntity(), new Properties()); - } - - public void setObject(Properties p) { - file = (IFile)p.get("file"); - path = (IPath)p.get("path"); - rs = (file != null) ? getReferenceList().getAllResources(file) : - (path != null) ? getReferenceList().getAllResources(path) - : new ResourceReference[0]; - if(rs.length == 0) { - rs = new ResourceReference[1]; - rs[0] = new ResourceReference("", ResourceReference.FILE_SCOPE); - } - current = rs[0]; - object.setAttributeValue("location", current.getLocation()); - object.setAttributeValue("scope", current.getScopeName()); - - data = XEntityDataImpl.create(new String[][]{ - {getEntity(), "yes"}, - {"location", "no"}, - {"scope", "no"} - }); - - data.getAttributeData()[0].setValue(current.getLocation()); - data.getAttributeData()[1].setValue(current.getScopeName()); - - support.init(object, data); -// support.addPropertyChangeListener(new PropertyChangeListener() { -// public void propertyChange(PropertyChangeEvent evt) { -// } -// }); - } - - protected String getEntity() { - return (file != null) ? "VPEFolderReference" : "VPEFolderReferenceExt"; - } - - protected abstract ResourceReferenceList getReferenceList(); - protected abstract String getTitle(); - - public Control createControl(Composite parent) { - Group g = new Group(parent, SWT.SHADOW_ETCHED_IN); - GridLayout layout = new GridLayout(1, false); - g.setLayout(layout); - g.setText(getTitle()); - Control c = support.createControl(g); - if(file != null) { - DirectoryFieldEditorEx f = (DirectoryFieldEditorEx)support.getFieldEditorByName("location"); - f.setLastPath(file.getProject().getLocation().toString()); - } - GridData data = new GridData(GridData.FILL_BOTH); - c.setLayoutData(data); - return g; - } - - public void commit() { - support.store(); - current.setLocation(data.getAttributeData()[0].getValue()); - current.setScope(getNewScope()); - List l = new ArrayList(); - for (int i = rs.length - 2; i >= 0; i--) { - if(rs[i].getLocation().equals(current.getLocation())) continue; - if(rs[i].getScope() == current.getScope()) continue; - l.add(rs[i]); - } - l.add(current); - rs = (ResourceReference[])l.toArray(new ResourceReference[0]); - if(file != null) { - getReferenceList().setAllResources(file, rs); - } else { - getReferenceList().setAllResources(path, rs); - } - } - - int getNewScope() { - String s = data.getAttributeData()[1].getValue(); - for (int i = 0; i < ResourceReference.SCOPE_NAMES.length; i++) { - if(ResourceReference.SCOPE_NAMES[i].equals(s)) return i; - } - return ResourceReference.FILE_SCOPE; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/GlobalResourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/GlobalResourceReference.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/GlobalResourceReference.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,30 +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.editor.rreferences; - - -/** - * Global resource reference - * @author Evgenij Stherbin - * - */ -public class GlobalResourceReference extends ResourceReference { - - /** - * @param location - * @param scope - */ - public GlobalResourceReference(String location, int scope) { - super(location, scope); - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - - -public class RelativeFolderReferenceComposite extends FolderReferenceComposite { - - protected ResourceReferenceList getReferenceList() { - return RelativeFolderReferenceList.getInstance(); - } - - protected String getTitle() { - return "Actual Run-Time Relative Folder"; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/RelativeFolderReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.eclipse.core.runtime.QualifiedName; - -public class RelativeFolderReferenceList extends ResourceReferenceList { - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.RelativeFolder"); - static RelativeFolderReferenceList instance = new RelativeFolderReferenceList(); - - public static RelativeFolderReferenceList getInstance() { - return instance; - } - - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReference.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReference.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -public class ResourceReference { - public final static int FILE_SCOPE = 0; - public final static int FOLDER_SCOPE = 1; - public final static int PROJECT_SCOPE = 2; - public final static int GLOBAL_SCOPE = 3; - - public final static String[] SCOPE_NAMES = new String[]{"Page", "Folder", "Project","Global"}; - - protected String location; - protected int scope; - protected int depth = 0; - protected String properties = ""; - - protected boolean isGlobal = false; - - public boolean isGlobal() { - return isGlobal; - } - - public void setGlobal(boolean isGlobal) { - this.isGlobal = isGlobal; - } - - public ResourceReference(String location, int scope) { - this.location = location; - this.scope = scope; - int q = location.indexOf('%'); - if(q >= 0) { - properties = location.substring(q + 1); - this.location = location.substring(0, q); - } - } - - public String getLocation() { - return location; - } - - public int getScope() { - return scope; - } - - public void setLocation(String location) { - this.location = location; - } - - public void setProperties(String properties) { - this.properties = properties; - } - - public String getProperties() { - return properties; - } - - public void setScope(int scope) { - this.scope = scope; - } - - public String getScopeName() { - return SCOPE_NAMES[scope]; - } - - public void setDepth(int depth) { - this.depth = depth; - } - - public int getDepth() { - return depth; - } - - public String getLocationAndProperties() { - String v = location; - if(properties.length() > 0) { - v += "%" + properties; - } - return v; - } - - -// public static ResourceReference createResourceReference(String location, int scope) { -// ResourceReference rst = null; -// -// switch (scope) { -// case FILE_SCOPE: -// case FOLDER_SCOPE: -// case PROJECT_SCOPE: -// rst = new ResourceReference(location, scope); -// break; -// case GLOBAL_SCOPE: -// rst = new GlobalResourceReference(location, scope); -// break; -// default: -// throw new IllegalArgumentException("Illegal scope=" + scope); -// } -// return rst; -// } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,274 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.io.File; -import java.util.*; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.XModelObjectUtil; - -public abstract class ResourceReferenceList { - ResourceReferenceListListener[] listeners = new ResourceReferenceListListener[0]; - - protected abstract QualifiedName getPropertyName(); - - public void addChangeListener(ResourceReferenceListListener listener) { - int i = getListenerIndex(listener); - if(i >= 0) return; - ResourceReferenceListListener[] ls = new ResourceReferenceListListener[listeners.length + 1]; - System.arraycopy(listeners, 0, ls, 0, listeners.length); - ls[listeners.length] = listener; - listeners = ls; - } - - public void removeChangeListener(ResourceReferenceListListener listener) { - int i = getListenerIndex(listener); - if(i < 0) return; - ResourceReferenceListListener[] ls = new ResourceReferenceListListener[listeners.length - 1]; - if(i > 0) System.arraycopy(listeners, 0, ls, 0, i); - if(i < ls.length) System.arraycopy(listeners, i + 1, ls, i, ls.length - i); - listeners = ls; - } - - private int getListenerIndex(ResourceReferenceListListener listener) { - for (int i = 0; i < listeners.length; i++) { - if(listeners[i] == listener) return i; - } - return -1; - } - - public ResourceReference[] getAllResources(IFile file) { - Set locations = new HashSet(); - List css = new ArrayList(); - if(file.getProject() != null) { - String[] dcss = getDeclaredResources(file.getProject()); - for (int i = 0; i < dcss.length; i++) { - ResourceReference ref = new ResourceReference(dcss[i], ResourceReference.PROJECT_SCOPE); - locations.add(dcss[i]); - css.add(ref); - } - } - IResource parent = file.getParent(); - int depth = 0; - while(parent instanceof IFolder) { - String[] dcss = getDeclaredResources(parent); - for (int i = 0; i < dcss.length; i++) { - if(locations.contains(dcss[i])) continue; - ResourceReference ref = new ResourceReference(dcss[i], ResourceReference.FOLDER_SCOPE); - ref.setDepth(depth); - locations.add(dcss[i]); - css.add(ref); - } - parent = parent.getParent(); - depth++; - } - String[] dcss = getDeclaredResources(file); - for (int i = 0; i < dcss.length; i++) { - if(locations.contains(dcss[i])) continue; - ResourceReference ref = new ResourceReference(dcss[i], ResourceReference.FILE_SCOPE); - locations.add(dcss[i]); - css.add(ref); - } - return (ResourceReference[])css.toArray(new ResourceReference[0]); - } - - private String[] getDeclaredResources(IResource resource) { - String s = null; - try { - s = resource.getPersistentProperty(getPropertyName()); - } catch (CoreException e) { - //ignore - } - if(s == null || s.length() == 0) return new String[0]; - return XModelObjectUtil.asStringArray(s); - } - - public void setAllResources(IFile file, ResourceReference[] entries) { - IResource changed = null; - boolean b = setDeclaredResources(file, entries, ResourceReference.FILE_SCOPE, 0); - if(b) changed = file; - IResource parent = file.getParent(); - int depth = 0; - while(parent instanceof IFolder) { - b = setDeclaredResources(parent, entries, ResourceReference.FOLDER_SCOPE, depth); - if(b) changed = parent; - parent = parent.getParent(); - depth++; - } - if(file.getProject() != null) { - int scope = ResourceReference.PROJECT_SCOPE; - if(file.getParent() == file.getProject()) scope = 10; - b = setDeclaredResources(file.getProject(), entries, scope, 0); - if(b) changed = file.getProject(); - } - if(changed != null) fire(changed.getFullPath()); - } - - private boolean setDeclaredResources(IResource resource, ResourceReference[] entries, int scope, int depth) { - try { - String oldValue = resource.getPersistentProperty(getPropertyName()); - if(oldValue == null) oldValue = ""; - String newValue = encodeDeclaredResources(entries, scope, depth); - if(oldValue.equals(newValue)) return false; - resource.setPersistentProperty(getPropertyName(), newValue); - } catch (CoreException e) { - return false; - } - return true; - } - - private String encodeDeclaredResources(ResourceReference[] entries, int scope, int depth) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < entries.length; i++) { - int s = entries[i].getScope(); - if(scope < 10 && s != scope) continue; - if(scope == 10 && s == ResourceReference.FILE_SCOPE) continue; - if(scope == ResourceReference.FOLDER_SCOPE && entries[i].getDepth() != depth) continue; - if(sb.length() > 0) sb.append(";"); - sb.append(entries[i].getLocationAndProperties()); - } - return sb.toString(); - } - - void fire(IPath path) { - ResourceReferenceListListener[] ls = listeners; - for (int i = 0; i < ls.length; i++) { - IPath listenedPath = ls[i].getPath(); - if(listenedPath != null && path.isPrefixOf(listenedPath)) { - ls[i].changed(this); - } - } - } - - /* - * Handle opened external files - */ - TreeMap allExternalResources = null; - - private TreeMap getAllExternalResources() { - if(allExternalResources == null) { - allExternalResources = new TreeMap(); - String s = null; - try { - s = ModelPlugin.getWorkspace().getRoot().getPersistentProperty(getPropertyName()); - if(s != null) parseExternalResources(s); - } catch (CoreException e) { - //ignore - } - } - return allExternalResources; - } - private void parseExternalResources(String s) { - StringTokenizer st = new StringTokenizer(s, "#"); - while(st.hasMoreTokens()) { - String t = st.nextToken(); - int e = t.indexOf('='); - String path = t.substring(0, e); - String list = t.substring(e + 1); - if(new File(path).exists()) allExternalResources.put(path, list); - } - } - - private void setAllExternalResources() { - StringBuffer sb = new StringBuffer(); - Iterator it = allExternalResources.keySet().iterator(); - while(it.hasNext()) { - String path = it.next().toString(); - String list = (String)allExternalResources.get(path); - if(path != null && list != null && new File(path).exists()) { - if(sb.length() > 0) sb.append('#'); - sb.append(path).append('=').append(list); - } - } - try { - ModelPlugin.getWorkspace().getRoot().setPersistentProperty(getPropertyName(), sb.toString()); - } catch (CoreException e) { - //ignore - } - } - - public ResourceReference[] getAllResources(IPath path) { - Set locations = new HashSet(); - List css = new ArrayList(); - IPath parent = path.removeLastSegments(1); - int depth = 0; - boolean isGlobal = path.equals(Platform.getLocation()); - int setScope = isGlobal ? ResourceReference.GLOBAL_SCOPE : ResourceReference.FILE_SCOPE; - while(parent != null && parent.segmentCount() > 1) { - String[] dcss = getDeclaredResources(path); - for (int i = 0; i < dcss.length; i++) { - if(locations.contains(dcss[i])) continue; - ResourceReference ref = new ResourceReference(dcss[i],isGlobal ? ResourceReference.GLOBAL_SCOPE : ResourceReference.FOLDER_SCOPE); - if(isGlobal){ - ref.setGlobal(true); - } - ref.setDepth(depth); - locations.add(dcss[i]); - css.add(ref); - } - parent = parent.removeLastSegments(1); - depth++; - } - String[] dcss = getDeclaredResources(path); - for (int i = 0; i < dcss.length; i++) { - if(locations.contains(dcss[i])) continue; - ResourceReference ref = new ResourceReference(dcss[i], setScope); - if(setScope == ResourceReference.GLOBAL_SCOPE){ - ref.setGlobal(true); - } - locations.add(dcss[i]); - css.add(ref); - } - return (ResourceReference[])css.toArray(new ResourceReference[0]); - } - - private String[] getDeclaredResources(IPath path) { - String s = (String)getAllExternalResources().get(path.toString()); - return (s == null || s.length() == 0) ? new String[0] : XModelObjectUtil.asStringArray(s); - } - - public void setAllResources(IPath path, ResourceReference[] entries) { - IPath changed = null; - boolean b = false; - int checkScope = path.equals(Platform.getLocation()) ? ResourceReference.GLOBAL_SCOPE : ResourceReference.FILE_SCOPE; - - b = setDeclaredResources(path, entries, checkScope, 0); - if(b) changed = path; - IPath parent = path.removeLastSegments(1); - int depth = 0; - while(parent != null && parent.segmentCount() > 1) { - b = setDeclaredResources(parent, entries, ResourceReference.FOLDER_SCOPE, depth); - if(b) changed = parent; - parent = parent.removeLastSegments(1); - depth++; - } - if(changed != null) { - setAllExternalResources(); - fire(changed); - } - } - - private boolean setDeclaredResources(IPath path, ResourceReference[] entries, int scope, int depth) { - String oldValue = (String)getAllExternalResources().get(path.toString()); - if(oldValue == null) oldValue = ""; - String newValue = encodeDeclaredResources(entries, scope, depth); - if(oldValue.equals(newValue)) return false; - if(newValue == null || newValue.length() == 0) { - getAllExternalResources().remove(path.toString()); - } else { - getAllExternalResources().put(path.toString(), newValue); - } - return true; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceListListener.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceListListener.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferenceListListener.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.eclipse.core.runtime.IPath; - -public interface ResourceReferenceListListener { - public IPath getPath(); - public void changed(Object source); - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,210 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -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.eclipse.swt.widgets.Group; -import org.jboss.tools.common.meta.XAttribute; -import org.jboss.tools.common.meta.XModelEntity; -import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter; -import org.jboss.tools.common.meta.impl.XModelMetaDataImpl; -import org.jboss.tools.common.model.ui.action.CommandBar; -import org.jboss.tools.common.model.ui.action.CommandBarListener; -import org.jboss.tools.common.model.ui.objecteditor.XTable; - -public abstract class ResourceReferencesComposite { - protected static String ADD = "Add"; - protected static String EDIT = "Edit"; - protected static String REMOVE = "Remove"; - protected XTable table = new XTable(); - protected CommandBar bar = new CommandBar(); - protected ResourceReferencesTableProvider tableProvider;// = new TemplatesTableProvider(); - protected IFile file; - protected IPath path; - protected List dataList = new ArrayList(); - - public ResourceReferencesComposite() { - init(); - } - - private void init() { - tableProvider = createTableProvider(dataList); - bar.getLayout().buttonWidth = 80; - bar.getLayout().direction = SWT.VERTICAL; - bar.setCommands(new String[]{ADD, EDIT, REMOVE}); - bar.addCommandBarListener(new BarListener()); - table.setTableProvider(tableProvider); - } - - protected abstract ResourceReferencesTableProvider createTableProvider(List dataList); - protected abstract ResourceReferenceList getReferenceList(); - - /** - * Returned the label that will display in group. - * - * @return label displayed in group - * @see #createControl(Composite) - */ - protected abstract String createGroupLabel(); - - - public void setObject(Object object) { - Properties p = (Properties)object; - file = (IFile)p.get("file"); - path = (IPath)p.get("path"); - ResourceReference[] rs = (file != null) ? getReferenceList().getAllResources(file) : - (path != null) ? getReferenceList().getAllResources(path) - : new ResourceReference[0]; - for (int i = 0; i < rs.length; i++) dataList.add(rs[i]); - } - - 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(c1,SWT.NONE); - - group.setText(createGroupLabel()); - group.setLayoutData(new GridData(GridData.FILL_BOTH)); - GridLayout g = new GridLayout(2, false); - group.setLayout(g); - - - Control slc = table.createControl(group); - slc.setLayoutData(new GridData(GridData.FILL_BOTH)); - Control bc = bar.createControl(group); - - - GridData gd = new GridData(GridData.FILL_VERTICAL); - bc.setLayoutData(gd); - table.getTable().addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - updateBars(); - } - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - }); - update(); - return c1; - } - - ResourceReference[] getReferenceArray() { - return (ResourceReference[])dataList.toArray(new ResourceReference[0]); - } - - /** - * Clear all entries from table. - */ - public void clearAll(){ - if(this.dataList!=null){ - this.dataList.clear(); - } - } - - public void commit() { - if(file != null) { - getReferenceList().setAllResources(file, getReferenceArray()); - } else { - getReferenceList().setAllResources(path, getReferenceArray()); - } - } - class BarListener implements CommandBarListener { - public void action(String command) { - int index = table.getSelectionIndex(); - if(ADD.equals(command)) { - add(index); - } else if(EDIT.equals(command)) { - edit(index); - } else if(REMOVE.equals(command)) { - remove(index); - } - update(); - } - } - - protected void add(int index) { - ResourceReference css = getDefaultResourceReference(); - - initFilterInFileChooser(); - boolean ok = VpeAddReferenceSupport.add(file, css, getReferenceArray(), getEntity()); - if(!ok) return; - dataList.add(css); - update(); - table.setSelection(dataList.size() - 1); - } - - /** - * @return - */ - protected ResourceReference getDefaultResourceReference() { - return new ResourceReference("", ResourceReference.FOLDER_SCOPE); - } - - protected void edit(int index) { - if(index < 0) return; - ResourceReference css = getReferenceArray()[index]; - initFilterInFileChooser(); - boolean ok = VpeAddReferenceSupport.edit(file, css, getReferenceArray(), getEntity()); - if(!ok) return; - update(); - } - - protected abstract String getEntity(); - - void remove(int index) { - if(index >= 0) dataList.remove(index); - } - - public void update() { - if(table != null) table.update(); - updateBars(); - } - - void updateBars() { - bar.setEnabled(EDIT, canModify()); - bar.setEnabled(REMOVE, canModify()); - } - - private boolean canModify() { - return table.getSelectionIndex() >= 0; - } - - private 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()); - } - } - } - } - - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesTableProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesTableProvider.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/ResourceReferencesTableProvider.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,107 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.List; -import org.jboss.tools.common.model.ui.objecteditor.*; -import org.eclipse.swt.graphics.*; - -public class ResourceReferencesTableProvider implements XTableProvider, XTableImageProvider { - static String[] CSS_COLUMNS = new String[]{"Scope", "CSS File Path"}; - static String[] IMG_COLUMNS = new String[]{"Scope", "Image Folder Path"}; - static String[] TLD_COLUMNS = new String[]{"Scope", "URI", "Prefix"}; - static String[] EL_COLUMNS = new String[]{"Scope", "El Expression", "Value"}; - private final static String[] GLOBAL_EL_COLUMNS = new String[]{"Scope","El Expression", "Value"}; - - int[] widths = new int[]{50, 200}; - List dataList; - String[] columns; - - public static ResourceReferencesTableProvider getCSSTableProvider(List dataList) { - ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); - p.columns = CSS_COLUMNS; - return p; - } - - public static ResourceReferencesTableProvider getImageTableProvider(List dataList) { - ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); - p.columns = IMG_COLUMNS; - return p; - } - - public static ResourceReferencesTableProvider getTLDTableProvider(List dataList) { - ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); - p.columns = TLD_COLUMNS; - p.widths = new int[]{50, 150, 50}; - return p; - } - - public static ResourceReferencesTableProvider getELTableProvider(List dataList) { - ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); - p.columns = EL_COLUMNS; - p.widths = new int[]{50, 150, 50}; - return p; - } - - - public static ResourceReferencesTableProvider getGlobalELTableProvider(final List dataList) { - ResourceReferencesTableProvider p = new ResourceReferencesTableProvider(dataList); - - p.columns = GLOBAL_EL_COLUMNS; - p.widths = new int[]{50,150, 50}; - return p; - } - - - - - private ResourceReferencesTableProvider(List dataList) { - this.dataList = dataList; - } - - public int getColumnCount() { - return columns.length; - } - - public int getRowCount() { - if(dataList == null) return 0; - return dataList.size(); - } - - public String getColumnName(int c) { - return columns[c]; - } - - public String getValueAt(int r, int c) { - ResourceReference css = (ResourceReference)dataList.get(r); - return (c == 0) ? css.getScopeName() : (c == 2) ? css.getProperties() : css.getLocation(); - } - - public Object getDataAt(int r) { - return null; - } - - public Color getColor(int r) { - return null; - } - - public int getWidthHint(int c) { - return widths[c]; - } - - public void dispose() { - } - - public Image getImage(int r) { - return null; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferenceList.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferenceList.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import org.eclipse.core.runtime.QualifiedName; - -public class TaglibReferenceList extends ResourceReferenceList { - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.TLDList"); - static TaglibReferenceList instance = new TaglibReferenceList(); - - public static TaglibReferenceList getInstance() { - return instance; - } - - protected QualifiedName getPropertyName() { - return PROPERTY_NAME; - } - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferencesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferencesComposite.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/TaglibReferencesComposite.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.List; - -import org.jboss.tools.common.editor.messages.Messages; - -/** - * - * @author Eugene Stherbin - * - */ -public class TaglibReferencesComposite extends ResourceReferencesComposite { - - protected String getEntity() { - return (file != null) ? "VPETLDReference" : "VPETLDReferenceExt"; //$NON-NLS-1$ //$NON-NLS-2$ - } - - protected ResourceReferencesTableProvider createTableProvider(List dataList) { - return ResourceReferencesTableProvider.getTLDTableProvider(dataList); - } - - protected ResourceReferenceList getReferenceList() { - return TaglibReferenceList.getInstance(); - } - - /** - * @see ResourceReferencesComposite#createGroupLabel() - */ - @Override - protected String createGroupLabel() { - return Messages.INCLUDED_TAG_LIBS; - } - - - -} Deleted: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/VpeAddReferenceSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/VpeAddReferenceSupport.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/rreferences/VpeAddReferenceSupport.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.common.editor.rreferences; - -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.TreeSet; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.common.meta.action.XActionInvoker; -import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; -import org.jboss.tools.common.meta.constraint.XAttributeConstraintL; -import org.jboss.tools.common.model.XModel; -import org.jboss.tools.common.model.XModelException; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; -import org.jboss.tools.common.model.project.IModelNature; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.project.WebProject; -import org.jboss.tools.jst.web.tld.TaglibMapping; - -public class VpeAddReferenceSupport extends SpecialWizardSupport { - - public static boolean add(IFile file, ResourceReference css, ResourceReference[] list, String entity) { - return run(file, css, list, "CreateActions.AddItem", entity); //$NON-NLS-1$ - } - - public static boolean edit(IFile file, ResourceReference css, ResourceReference[] list, String entity) { - return run(file, css, list, "EditActions.EditItem", entity); //$NON-NLS-1$ - } - - private static boolean run(IFile file, ResourceReference css, ResourceReference[] list, String action, String entity) { - XModel model = PreferenceModelUtilities.getPreferenceModel(); - XModelObject object = model.createModelObject(entity, null); - object.setAttributeValue("location", css.getLocation()); //$NON-NLS-1$ - if(object.getAttributeValue("prefix") != null) { //$NON-NLS-1$ - object.setAttributeValue("prefix", css.getProperties()); //$NON-NLS-1$ - } - Properties p = new Properties(); - p.put("scope",Integer.valueOf(css.getScope())); //$NON-NLS-1$ - p.put("list", list); //$NON-NLS-1$ - if(file != null) p.put("file", file); //$NON-NLS-1$ - XActionInvoker.invoke(action, object, p); - boolean ok = "true".equals(p.getProperty("okPressed")); //$NON-NLS-1$ //$NON-NLS-2$ - if(ok) { - css.setLocation(object.getAttributeValue("location")); //$NON-NLS-1$ - Integer scope = (Integer)p.get("scope"); //$NON-NLS-1$ - - css.setScope(scope.intValue()); - if(css.isGlobal()){ - css.setScope(ResourceReference.GLOBAL_SCOPE); - } - String properties = object.getAttributeValue("prefix"); //$NON-NLS-1$ - if(properties != null) css.setProperties(properties); - } - return ok; - } - - IFile file = null; - String initialLocation; - String initialPrefix; - ResourceReference[] list; - String[] scopeNames; - - protected void reset() { - initialLocation = getTarget().getAttributeValue("location"); //$NON-NLS-1$ - setAttributeValue(0, "location", initialLocation); //$NON-NLS-1$ - initialPrefix = getTarget().getAttributeValue("prefix"); //$NON-NLS-1$ - if(initialPrefix != null) { - setAttributeValue(0, "prefix", initialPrefix); //$NON-NLS-1$ - } - final XAttributeConstraintL scopeAttribute = ((XAttributeConstraintL) getTarget().getModelEntity().getAttribute("scope") //$NON-NLS-1$ - .getConstraint()); - if (scopeAttribute != null) { - scopeNames = scopeAttribute.getValues(); - } - int scopeIndex = ((Integer)getProperties().get("scope")).intValue(); //$NON-NLS-1$ - - if(scopeIndex == 1 && scopeNames.length == 1){ - scopeIndex = 0; - }else if(scopeIndex > scopeNames.length){ - scopeIndex = scopeNames.length -1; - } - String scope = scopeNames[scopeIndex]; - setAttributeValue(0, "scope", scope); //$NON-NLS-1$ - list = (ResourceReference[])getProperties().get("list"); //$NON-NLS-1$ - file = (IFile)getProperties().get("file"); //$NON-NLS-1$ - setURIList(); - } - - void setURIList() { - if(file == null) return; - if(getEntityData()[0].getModelEntity().getName().startsWith("VPETLD")) { //$NON-NLS-1$ - Set set = new TreeSet(); - IModelNature n = EclipseResourceUtil.getModelNature(file.getProject()); - if(n == null) return; - XModel model = n.getModel(); - TaglibMapping taglibs = WebProject.getInstance(model).getTaglibMapping(); - Map map = taglibs.getTaglibObjects(); - Iterator it = map.keySet().iterator(); - while(it.hasNext()) { - String s = it.next().toString(); - set.add(taglibs.resolveURI(s)); - } - String[] uris = (String[])set.toArray(new String[0]); - setValueList(0, "location", uris); //$NON-NLS-1$ - } - } - - public void action(String name) throws XModelException { - if(OK.equals(name) || FINISH.equals(name)) { - execute(); - setFinished(true); - getProperties().setProperty("okPressed", "true"); //$NON-NLS-1$ //$NON-NLS-2$ - } else if(CANCEL.equals(name)) { - setFinished(true); - } - } - - protected void execute() throws XModelException { - Properties p0 = extractStepData(0); - getTarget().setAttributeValue("location", p0.getProperty("location")); //$NON-NLS-1$ //$NON-NLS-2$ - if(p0.containsKey("prefix")) { //$NON-NLS-1$ - getTarget().setAttributeValue("prefix", p0.getProperty("prefix")); //$NON-NLS-1$ //$NON-NLS-2$ - } - int scope = getSelectedScope(p0); - getProperties().put("scope", Integer.valueOf(scope)); //$NON-NLS-1$ - } - - int getSelectedScope(Properties p0) { - String scopeName = p0.getProperty("scope"); //$NON-NLS-1$ - for (int i = 0; i < scopeNames.length; i++) { - if(scopeNames[i].equals(scopeName)) return i; - } - return 0; - } - -} Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/DnDUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/DnDUtil.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/DnDUtil.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -15,85 +15,16 @@ import java.util.Properties; -import org.eclipse.swt.events.TypedEvent; import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; -import org.jboss.tools.common.model.ui.editors.dnd.context.IDNDTextEditor; -import org.jboss.tools.vpe.xulrunner.XPCOM; -import org.mozilla.interfaces.nsIComponentManager; -import org.mozilla.interfaces.nsIDOMEvent; -import org.mozilla.interfaces.nsIDOMText; -import org.mozilla.interfaces.nsIDragService; -import org.mozilla.interfaces.nsIDragSession; -import org.mozilla.interfaces.nsIFile; -import org.mozilla.interfaces.nsIServiceManager; -import org.mozilla.interfaces.nsIStringInputStream; -import org.mozilla.interfaces.nsISupports; -import org.mozilla.interfaces.nsISupportsCString; -import org.mozilla.interfaces.nsITransferable; -import org.mozilla.xpcom.Mozilla; /** * The Class DnDUtil. */ public class DnDUtil { - - /** The Constant kTextMime. */ - public static final String kTextMime = "text/plain"; //$NON-NLS-1$ - - /** The Constant kUnicodeMime. */ - public static final String kUnicodeMime = "text/unicode"; //$NON-NLS-1$ - - /** The Constant kHTMLMime. */ - public static final String kHTMLMime = "text/html"; //$NON-NLS-1$ - - /** The Constant kAOLMailMime. */ - public static final String kAOLMailMime = "AOLMAIL"; //$NON-NLS-1$ - - /** The Constant kPNGImageMime. */ - public static final String kPNGImageMime = "image/png"; //$NON-NLS-1$ - - /** The Constant kJPEGImageMime. */ - public static final String kJPEGImageMime = "image/jpg"; //$NON-NLS-1$ - - /** The Constant kGIFImageMime. */ - public static final String kGIFImageMime = "image/gif"; //$NON-NLS-1$ - - /** The Constant kFileMime. */ - public static final String kFileMime = "application/x-moz-file"; //$NON-NLS-1$ - - /** The Constant kURLMime. */ - public static final String kURLMime = "text/x-moz-url"; //$NON-NLS-1$ - - /** The Constant kURLDataMime. */ - public static final String kURLDataMime = "text/x-moz-url-data"; //$NON-NLS-1$ - - /** The Constant kURLDescriptionMime. */ - public static final String kURLDescriptionMime = "text/x-moz-url-desc"; //$NON-NLS-1$ - - /** The Constant kNativeImageMime. */ - public static final String kNativeImageMime = "application/x-moz-nativeimage"; //$NON-NLS-1$ - - /** The Constant kNativeHTMLMime. */ - public static final String kNativeHTMLMime = "application/x-moz-nativehtml"; //$NON-NLS-1$ - - /** The Constant kFilePromiseURLMime. */ - public static final String kFilePromiseURLMime = "application/x-moz-file-promise-url"; //$NON-NLS-1$ - - /** The Constant kFilePromiseMime. */ - public static final String kFilePromiseMime = "application/x-moz-file-promise"; //$NON-NLS-1$ - - /** The Constant kFilePromiseDirectoryMime. */ - public static final String kFilePromiseDirectoryMime = "application/x-moz-file-promise-dir"; //$NON-NLS-1$ - - /** The Constant FLAVORS. */ - public static final String[] FLAVORS = { kTextMime, kUnicodeMime, kHTMLMime, kAOLMailMime, kPNGImageMime, kJPEGImageMime, - kGIFImageMime, kFileMime, kURLMime, kURLDataMime, kURLDescriptionMime, kNativeImageMime, kNativeHTMLMime, kFilePromiseURLMime, - kFilePromiseMime, kFilePromiseDirectoryMime }; - + /** * Gets the enabled action. * @@ -199,59 +130,5 @@ paste.executeHandler(object, properties); } - /** - * Convert2 vpe dn D event. - * - * @param event the event - * - * @return the vpe dn D event - */ - public static VpeDnDEvent convert2VpeDnDEvent(nsIDOMEvent event) { - return null; - } - - /** - * Fire dn D event. - * - * @param dropContext the drop context - * @param event the event - * @param textEditor the text editor - */ - public static void fireDnDEvent(DropContext dropContext, IDNDTextEditor textEditor, TypedEvent event) { - - dropContext.runDropCommand(textEditor, event); - } - - /** - * Gets the dn D file. - * - * @param event the event - * - * @return the dn D file - */ - public static nsISupports getDnDValue(nsIDOMEvent event) { - nsIServiceManager serviceManager = Mozilla.getInstance().getServiceManager(); - nsIComponentManager componentManager = Mozilla.getInstance().getComponentManager(); - nsIDragService dragService = (nsIDragService) serviceManager.getServiceByContractID(&quot;(a)mozilla.org/widget/dragservice;1&quot;, //$NON-NLS-1$ - nsIDragService.NS_IDRAGSERVICE_IID); - final nsIDragSession dragSession = dragService.getCurrentSession(); - - final nsITransferable iTransferable = (nsITransferable) componentManager.createInstanceByContractID( - XPCOM.NS_TRANSFERABLE_CONTRACTID, null, nsITransferable.NS_ITRANSFERABLE_IID); - - for (String flavor1 : FLAVORS) { - if (dragSession.isDataFlavorSupported(flavor1)) { - iTransferable.addDataFlavor(flavor1); - } - } - String[] aFlavor = { "" }; //$NON-NLS-1$ - long[] aDataLen = { 0 }; - nsISupports[] aData = { null }; - - dragSession.getData(iTransferable, 0); - iTransferable.getAnyTransferData(aFlavor, aData, aDataLen); - return aData[0]; - } - } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropCommandFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropCommandFactory.java 2008-08-26 14:16:49 UTC (rev 9901) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropCommandFactory.java 2008-08-26 14:17:01 UTC (rev 9902) @@ -46,7 +46,7 @@ public static final String kUnicodeMime = "text/unicode"; //$NON-NLS-1$ /** The Constant kHtmlText. */ - public static final String kHtmlText = DnDUtil.kHTMLMime; + public static final String kHtmlText = "text/html"; //$NON-NLS-1$ /** The PACKAGE. */ static String PACKAGE = "org.jboss.tools.common.model.ui.editors.dnd."; //$NON-NLS-1$