Author: mareshkau Date: 2010-03-17 13:34:43 -0400 (Wed, 17 Mar 2010) New Revision: 20896 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/GlobalElVariablesComposite.java Removed: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5867 , class has been moved and import dependency removed from plugin manifest Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2010-03-17 17:10:31 UTC (rev 20895) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/META-INF/MANIFEST.MF 2010-03-17 17:34:43 UTC (rev 20896) @@ -10,7 +10,6 @@ Bundle-Activator: org.jboss.tools.common.el.ui.ElUiPlugin Require-Bundle: org.eclipse.ui, org.jboss.tools.common.el.core, - org.jboss.tools.common.resref.ui, org.jboss.tools.common.model.ui, org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", @@ -19,4 +18,4 @@ org.jboss.tools.common.ui Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.jboss.tools.vpe.resref.core + Deleted: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2010-03-17 17:10:31 UTC (rev 20895) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2010-03-17 17:34:43 UTC (rev 20896) @@ -1,93 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.common.el.ui; - -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.common.el.core.GlobalELReferenceList; -import org.jboss.tools.common.resref.core.ResourceReference; -import org.jboss.tools.common.resref.core.ResourceReferenceList; -import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; -import org.jboss.tools.vpe.resref.core.AbstractResourceReferencesComposite; -import org.jboss.tools.vpe.resref.core.GlobalELReferenceWizardDialog; -import org.jboss.tools.vpe.resref.core.ReferenceWizardDialog; - - -/** - * Composite class for the global el variables. - * @author Evgenij Stherbin - * - */ -public class GlobalElVariablesComposite extends AbstractResourceReferencesComposite { - - /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createTableProvider(java.util.List) - */ - @Override - protected ResourceReferencesTableProvider createTableProvider(List dataList) { - return ResourceReferencesTableProvider.getGlobalELTableProvider(dataList); - } - - /** - * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getReferenceList() - */ - @Override - protected ResourceReferenceList getReferenceList() { - return GlobalELReferenceList.getInstance(); - } - - @Override - protected ResourceReference getDefaultResourceReference() { - ResourceReference rf = new ResourceReference("", ResourceReference.GLOBAL_SCOPE); //$NON-NLS-1$ - rf.setGlobal(true); - return rf; - } - - protected ReferenceWizardDialog getDialog(ResourceReference resref) { - return new GlobalELReferenceWizardDialog( - PlatformUI.getWorkbench().getDisplay().getActiveShell(), fileLocation, resref, getReferenceArray()); - } - - @Override - protected void add(int index) { - ResourceReference resref = getDefaultResourceReference(); - int returnCode = -1; - ReferenceWizardDialog d = getDialog(resref); - if (null != d) { - returnCode = d.open(); - } - if (Dialog.OK == returnCode) { - dataList.add(resref); - update(); - table.setSelection(dataList.size() - 1); - } - } - - @Override - protected void edit(int index) { - if(index < 0) { - return; - } - ResourceReference resref = getReferenceArray()[index]; - int returnCode = -1; - ReferenceWizardDialog d = getDialog(resref); - if (null != d) { - returnCode = d.open(); - } - if (Dialog.OK == returnCode) { - update(); - } - } - -} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2010-03-17 17:10:31 UTC (rev 20895) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2010-03-17 17:34:43 UTC (rev 20896) @@ -20,7 +20,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.jboss.tools.common.el.ui.GlobalElVariablesComposite; /** * Page for the El preferences. Copied: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/GlobalElVariablesComposite.java (from rev 20893, trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/GlobalElVariablesComposite.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/GlobalElVariablesComposite.java 2010-03-17 17:34:43 UTC (rev 20896) @@ -0,0 +1,93 @@ +/******************************************************************************* + * 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.editor.preferences; + +import java.util.List; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.el.core.GlobalELReferenceList; +import org.jboss.tools.common.resref.core.ResourceReference; +import org.jboss.tools.common.resref.core.ResourceReferenceList; +import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider; +import org.jboss.tools.vpe.resref.core.AbstractResourceReferencesComposite; +import org.jboss.tools.vpe.resref.core.GlobalELReferenceWizardDialog; +import org.jboss.tools.vpe.resref.core.ReferenceWizardDialog; + + +/** + * Composite class for the global el variables. + * @author Evgenij Stherbin + * + */ +public class GlobalElVariablesComposite extends AbstractResourceReferencesComposite { + + /** + * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#createTableProvider(java.util.List) + */ + @Override + protected ResourceReferencesTableProvider createTableProvider(List dataList) { + return ResourceReferencesTableProvider.getGlobalELTableProvider(dataList); + } + + /** + * @see org.jboss.tools.common.resref.core.AbstractResourceReferencesComposite#getReferenceList() + */ + @Override + protected ResourceReferenceList getReferenceList() { + return GlobalELReferenceList.getInstance(); + } + + @Override + protected ResourceReference getDefaultResourceReference() { + ResourceReference rf = new ResourceReference("", ResourceReference.GLOBAL_SCOPE); //$NON-NLS-1$ + rf.setGlobal(true); + return rf; + } + + protected ReferenceWizardDialog getDialog(ResourceReference resref) { + return new GlobalELReferenceWizardDialog( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), fileLocation, resref, getReferenceArray()); + } + + @Override + protected void add(int index) { + ResourceReference resref = getDefaultResourceReference(); + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + dataList.add(resref); + update(); + table.setSelection(dataList.size() - 1); + } + } + + @Override + protected void edit(int index) { + if(index < 0) { + return; + } + ResourceReference resref = getReferenceArray()[index]; + int returnCode = -1; + ReferenceWizardDialog d = getDialog(resref); + if (null != d) { + returnCode = d.open(); + } + if (Dialog.OK == returnCode) { + update(); + } + } + +}