summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Stryker2013-01-08 03:44:36 (EST)
committerRob Stryker2013-04-30 05:47:51 (EDT)
commit3b9f70b8c677778cf3747b3b23a7aad8cd7e1c86 (patch)
tree1a674a5eae9b8d85c820a2ca636d184443c1ba3b
parentf265672e3e9c613c9c047e2769fe0336599d99ec (diff)
downloadwebtools.javaee-3b9f70b8c677778cf3747b3b23a7aad8cd7e1c86.zip
webtools.javaee-3b9f70b8c677778cf3747b3b23a7aad8cd7e1c86.tar.gz
webtools.javaee-3b9f70b8c677778cf3747b3b23a7aad8cd7e1c86.tar.bz2
changes for javaee to make use of changes to common
-rw-r--r--plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java3
-rw-r--r--plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java6
-rw-r--r--plugins/org.eclipse.jst.j2ee/plugin.xml6
3 files changed, 11 insertions, 4 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
index ff12d45..6847624 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
@@ -31,6 +31,7 @@ import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.flat.FilterResourceParticipant;
+import org.eclipse.wst.common.componentcore.internal.flat.GlobalHeirarchyParticipant;
import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -261,7 +262,7 @@ public class JavaEESingleRootCallback implements SingleRootParticipantCallback {
public IFlattenParticipant[] getDelegateParticipants() {
List<IFlattenParticipant> participants = new ArrayList<IFlattenParticipant>();
- participants.add(new JEEHeirarchyExportParticipant());
+ participants.add(new GlobalHeirarchyParticipant());
participants.add(FilterResourceParticipant.createSuffixFilterParticipant(filteredSuffixes));
participants.add(new AddClasspathLibReferencesParticipant());
participants.add(new AddClasspathLibRefsProviderParticipant());
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
index 2925e5c..ee78a98 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
@@ -20,12 +20,12 @@ import org.eclipse.jst.common.internal.modulecore.IgnoreJavaInSourceFolderPartic
import org.eclipse.jst.common.internal.modulecore.ReplaceManifestExportParticipant;
import org.eclipse.jst.common.internal.modulecore.SingleRootExportParticipant;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.exportmodel.JEEHeirarchyExportParticipant;
import org.eclipse.jst.j2ee.internal.common.exportmodel.JavaEESingleRootCallback;
import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
+import org.eclipse.wst.common.componentcore.internal.flat.GlobalHeirarchyParticipant;
import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipantProvider;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -59,7 +59,7 @@ public class JEEFlattenParticipantProvider implements
if( JEESingleRootParticipant.equals(id))
return forExport ? null : new SingleRootExportParticipant(new JavaEESingleRootCallback());
if( JEEHeirarchyExportParticipant.equals(id))
- return forExport ? createExportHierarchyParticipant() : new JEEHeirarchyExportParticipant();
+ return forExport ? createExportHierarchyParticipant() : new GlobalHeirarchyParticipant();
if( AddClasspathLibReferencesParticipant.equals(id))
return new AddClasspathLibReferencesParticipant();
if( AddClasspathFoldersParticipant.equals(id))
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 0c0ea1c..25f0fb6 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -1023,4 +1023,10 @@
weight="10">
</flattenParticipantProvider>
</extension>
+ <extension
+ point="org.eclipse.wst.common.modulecore.heirarchyFlattenParticipant">
+ <heirarchyParticipant
+ class="org.eclipse.jst.j2ee.internal.common.exportmodel.JEEHeirarchyExportParticipant">
+ </heirarchyParticipant>
+ </extension>
</plugin>