Author: estherbin
Date: 2008-09-01 10:10:06 -0400 (Mon, 01 Sep 2008)
New Revision: 9996
Added:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalElVariablesComposite.java
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ELReferenceList.java
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ElVariablesComposite.java
Removed:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/vpe/
Modified:
trunk/common/plugins/org.jboss.tools.common.el/.classpath
trunk/common/plugins/org.jboss.tools.common.el/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/Activator.java
Log:
Moved resources reference functionality to the separate bundle.
Modified: trunk/common/plugins/org.jboss.tools.common.el/.classpath
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el/.classpath 2008-09-01 13:46:47 UTC (rev
9995)
+++ trunk/common/plugins/org.jboss.tools.common.el/.classpath 2008-09-01 14:10:06 UTC (rev
9996)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/common/plugins/org.jboss.tools.common.el/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el/META-INF/MANIFEST.MF 2008-09-01
13:46:47 UTC (rev 9995)
+++ trunk/common/plugins/org.jboss.tools.common.el/META-INF/MANIFEST.MF 2008-09-01
14:10:06 UTC (rev 9996)
@@ -1,10 +1,15 @@
Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
+Eclipse-LazyStart: true
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
Bundle-Name: El Plug-in
Bundle-SymbolicName: org.jboss.tools.common.el
-Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.tools.vpe.el.Activator
+Bundle-Version: 2.0.0
+Provide-Package: org.jboss.tools.common.el,
+ org.jboss.tools.common.el.global,
+ org.jboss.tools.common.el.vpe
+Bundle-Activator: org.jboss.tools.common.el.Activator
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.core.runtime,
+ org.jboss.tools.common.rreferences;bundle-version="2.0.0",
+ org.eclipse.core.resources;bundle-version="3.4.0"
Copied: trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el (from
rev 9978, trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/vpe/el)
Modified:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/Activator.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/vpe/el/Activator.java 2008-09-01
11:45:16 UTC (rev 9978)
+++
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/Activator.java 2008-09-01
14:10:06 UTC (rev 9996)
@@ -1,4 +1,4 @@
-package org.jboss.tools.vpe.el;
+package org.jboss.tools.common.el;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.vpe.el";
+ public static final String PLUGIN_ID = "org.jboss.tools.common.el";
// The shared instance
private static Activator plugin;
Added:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java 2008-09-01
14:10:06 UTC (rev 9996)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.common.el.global;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.rreferences.core.ResourceReferenceList;
+
+/**
+ * @author Evgenij Stherbin
+ *
+ */
+public class GlobalELReferenceList extends ResourceReferenceList {
+ /** The PROPERT y_ NAME. */
+ private static QualifiedName PROPERTY_NAME = new QualifiedName("",
"org.jboss.tools.vpe.editor.css.GlobalELReference");
+
+ /** The instance. */
+ private static GlobalELReferenceList instance = new GlobalELReferenceList();
+
+ /**
+ * Gets the instance.
+ *
+ * @return the instance
+ */
+ public synchronized static GlobalELReferenceList getInstance() {
+ return instance;
+ }
+
+ private GlobalELReferenceList() {
+ super();
+ }
+
+ /**
+ * Gets the property name.
+ *
+ * @return the property name
+ */
+ protected QualifiedName getPropertyName() {
+ return PROPERTY_NAME;
+ }
+
+
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalElVariablesComposite.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalElVariablesComposite.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalElVariablesComposite.java 2008-09-01
14:10:06 UTC (rev 9996)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * 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.global;
+
+import java.util.List;
+
+import org.jboss.tools.common.rreferences.core.ResourceReference;
+import org.jboss.tools.common.rreferences.core.ResourceReferenceList;
+import org.jboss.tools.common.rreferences.core.ResourceReferencesComposite;
+import org.jboss.tools.common.rreferences.core.ResourceReferencesTableProvider;
+
+
+/**
+ * Composite class for the global el variables.
+ * @author Evgenij Stherbin
+ *
+ */
+public class GlobalElVariablesComposite extends ResourceReferencesComposite {
+
+ /**
+ * @see
org.jboss.tools.common.rreferences.core.ResourceReferencesComposite#createGroupLabel()
+ */
+ @Override
+ protected String createGroupLabel() {
+ return "";
+ }
+
+ /**
+ * @see
org.jboss.tools.common.rreferences.core.ResourceReferencesComposite#createTableProvider(java.util.List)
+ */
+ @Override
+ protected ResourceReferencesTableProvider createTableProvider(List dataList) {
+ return ResourceReferencesTableProvider.getGlobalELTableProvider(dataList);
+ }
+
+ /**
+ * @see
org.jboss.tools.common.rreferences.core.ResourceReferencesComposite#getEntity()
+ */
+ @Override
+ protected String getEntity() {
+ return (file != null) ? "VPEGlobalElReference" :
"VPEGlobalElReferenceExt";
+ }
+
+ /**
+ * @see
org.jboss.tools.common.rreferences.core.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;
+ }
+
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/global/GlobalElVariablesComposite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ELReferenceList.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ELReferenceList.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ELReferenceList.java 2008-09-01
14:10:06 UTC (rev 9996)
@@ -0,0 +1,36 @@
+package org.jboss.tools.common.el.vpe;
+
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.rreferences.core.ResourceReferenceList;
+
+
+/**
+ * The Class ELReferenceList.
+ */
+public class ELReferenceList extends ResourceReferenceList {
+
+ /** The PROPERT y_ NAME. */
+ private static QualifiedName PROPERTY_NAME = new QualifiedName("",
"org.jboss.tools.vpe.editor.css.ELReference");
+
+ /** The instance. */
+ static ELReferenceList instance = new ELReferenceList();
+
+ /**
+ * Gets the instance.
+ *
+ * @return the instance
+ */
+ public static ELReferenceList getInstance() {
+ return instance;
+ }
+
+ /**
+ * Gets the property name.
+ *
+ * @return the property name
+ */
+ protected QualifiedName getPropertyName() {
+ return PROPERTY_NAME;
+ }
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ELReferenceList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ElVariablesComposite.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ElVariablesComposite.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ElVariablesComposite.java 2008-09-01
14:10:06 UTC (rev 9996)
@@ -0,0 +1,58 @@
+package org.jboss.tools.common.el.vpe;
+
+import java.util.List;
+
+import org.jboss.tools.common.rreferences.core.ResourceReferenceList;
+import org.jboss.tools.common.rreferences.core.ResourceReferencesComposite;
+import org.jboss.tools.common.rreferences.core.ResourceReferencesTableProvider;
+import org.jboss.tools.common.rreferences.messages.Messages;
+
+/**
+ * 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;
+ }
+
+
+
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common.el/src/org/jboss/tools/common/el/vpe/ElVariablesComposite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native