Author: dgolovin Date: 2008-09-11 19:46:32 -0400 (Thu, 11 Sep 2008) New Revision: 10209 Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-2759 Copied: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core (from rev 10080, trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core) Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/AbsoluteFolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,9 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; -import org.jboss.tools.common.resref.messages.Messages; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public class AbsoluteFolderReferenceComposite extends FolderReferenceComposite { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/AbsoluteFolderReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,10 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public class AbsoluteFolderReferenceList extends ResourceReferenceList { private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.AbsoluteFolder"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/CSSReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,10 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public class CSSReferenceList extends ResourceReferenceList { private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.CSSList"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/CssReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,11 +8,11 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.List; -import org.jboss.tools.common.resref.messages.Messages; +import org.jboss.tools.common.resref.core.ResourceReferenceList; import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -0,0 +1,92 @@ +package org.jboss.tools.vpe.resref.core; + +import java.util.List; + +import org.jboss.tools.common.el.core.ELReferenceList; +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.resref.core.ResourceReference; +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) { + ResourceReference css = getDefaultResourceReference(); + + initFilterInFileChooser(); + boolean ok = VpeAddReferenceSupport.add(file, css, getReferenceArray(), + getEntity()); + if (!ok) + return; + dataList.add(css); + update(); + table.setSelection(dataList.size() - 1); + + } + + + @Override + protected void edit(int index) { + if (index < 0) { + return; + } + ResourceReference css = getReferenceArray()[index]; + initFilterInFileChooser(); + boolean ok = VpeAddReferenceSupport.edit(file, css, + getReferenceArray(), getEntity()); + if (ok) { + update(); + } + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/FolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,7 +8,7 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.ArrayList; import java.util.List; @@ -28,6 +28,8 @@ import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.attribute.XAttributeSupport; import org.jboss.tools.common.model.ui.attribute.editor.DirectoryFieldEditorEx; +import org.jboss.tools.common.resref.core.ResourceReference; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public abstract class FolderReferenceComposite { XAttributeSupport support = new XAttributeSupport(); @@ -81,15 +83,17 @@ public Control createControl(Composite parent) { Group g = new Group(parent, SWT.SHADOW_ETCHED_IN); + GridData data = new GridData(GridData.FILL_BOTH); GridLayout layout = new GridLayout(1, false); g.setLayout(layout); + g.setLayoutData(data); 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); + data = new GridData(GridData.FILL_BOTH); c.setLayoutData(data); return g; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/GlobalResourceReference.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -9,9 +9,11 @@ * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; +import org.jboss.tools.common.resref.core.ResourceReference; + /** * Global resource reference * @author Evgenij Stherbin Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -0,0 +1,45 @@ +/******************************************************************************* + * 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.vpe.resref.core; + +import java.util.ResourceBundle; + +import org.eclipse.osgi.util.NLS; + +/** + * The Class Messages. + * + * @author Eugene Stherbin + */ +public final class Messages { + + /** The Constant BUNDLE_NAME. */ + private static final String BUNDLE_NAME = "org.jboss.tools.vpe.resref.messages";//$NON-NLS-1$ + + /** The f resource bundle. */ + private static ResourceBundle fResourceBundle; + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + /** + * The Constructor. + */ + private Messages(){} + + + 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; +} Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/RelativeFolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,11 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; +import org.jboss.tools.common.resref.core.ResourceReferenceList; + public class RelativeFolderReferenceComposite extends FolderReferenceComposite { protected ResourceReferenceList getReferenceList() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/RelativeFolderReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,10 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public class RelativeFolderReferenceList extends ResourceReferenceList { private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.RelativeFolder"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/ResourceReferencesDialogView.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,7 +8,7 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.ArrayList; import java.util.List; @@ -27,6 +27,8 @@ import org.jboss.tools.common.model.ui.action.CommandBarListener; import org.jboss.tools.common.model.ui.objecteditor.XTable; import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView; +import org.jboss.tools.common.resref.core.ResourceReference; +import org.jboss.tools.common.resref.core.ResourceReferenceList; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; public abstract class ResourceReferencesDialogView extends AbstractQueryWizardView { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/TaglibReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,9 +8,10 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.resref.core.ResourceReferenceList; public class TaglibReferenceList extends ResourceReferenceList { private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.TLDList"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/TaglibReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,11 +8,11 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.List; -import org.jboss.tools.common.resref.messages.Messages; +import org.jboss.tools.common.resref.core.ResourceReferenceList; import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeAddReferenceSupport.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,7 +8,7 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.Iterator; import java.util.Map; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeCssReferencesDialog.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,7 +8,7 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; import java.util.List; import java.util.Properties; @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IPath; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizard; +import org.jboss.tools.common.resref.core.ResourceReferenceList; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; public class VpeCssReferencesDialog extends AbstractQueryWizard { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeResourceReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209) @@ -8,54 +8,22 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.common.resref.core; +package org.jboss.tools.vpe.resref.core; -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; +import org.jboss.tools.common.resref.core.ResourceReference; +import org.jboss.tools.common.resref.core.ResourceReferenceList; +import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite; import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; -public abstract class VpeResourceReferencesComposite { - 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 abstract class VpeResourceReferencesComposite extends AbstractResourceReferencesComposite { public VpeResourceReferencesComposite() { - init(); + super(); } - 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(); @@ -69,83 +37,6 @@ 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(); @@ -156,13 +47,6 @@ 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; @@ -173,39 +57,4 @@ 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()); - } - } - } - } - - } Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-09-11 23:46:32 UTC (rev 10209) @@ -0,0 +1,4 @@ +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 Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain