diff options
| author | Igor Fedorenko | 2011-03-25 16:43:15 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2011-03-25 16:43:15 +0000 |
| commit | 14fea612dd9f0145d693f199571fc6f20e6860a5 (patch) | |
| tree | 35797fea4ebca4891a005b63f19d480049b7559b /org.eclipse.m2e.scm | |
| parent | 1f6437e3e913dd7a842e4afb6a7dc3add7dec803 (diff) | |
| download | m2e-core-14fea612dd9f0145d693f199571fc6f20e6860a5.tar.gz m2e-core-14fea612dd9f0145d693f199571fc6f20e6860a5.tar.xz m2e-core-14fea612dd9f0145d693f199571fc6f20e6860a5.zip | |
Reversed dependency between m2e.jdt and m2e.scm
"Import Project From SCM" context menu action contribution was incorrectly
defined in m2e.jdt plugin.xml file. Moved that action contribution to
m2e.scm and changed m2e.scm to optionally depend on m2e.jdt. This way
both m2e.scm and m2e.jdt remain optional m2e components while providing
expected context menu actions when both are installed.
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.scm')
| -rw-r--r-- | org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.m2e.scm/plugin.xml | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index 96a8963e..af2c0b16 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -25,4 +25,5 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.2", org.eclipse.ui.workbench;bundle-version="3.5.2", org.eclipse.ui.ide;bundle-version="3.5.1", org.eclipse.jdt.core;bundle-version="3.5.2";resolution:=optional, - org.slf4j.api;bundle-version="1.6.1" + org.slf4j.api;bundle-version="1.6.1", + org.eclipse.m2e.jdt;bundle-version="[0.13.0,0.14.0)";resolution:=optional diff --git a/org.eclipse.m2e.scm/plugin.xml b/org.eclipse.m2e.scm/plugin.xml index eb13ddf3..2cbcce11 100644 --- a/org.eclipse.m2e.scm/plugin.xml +++ b/org.eclipse.m2e.scm/plugin.xml @@ -52,6 +52,25 @@ </and> </enablement> </objectContribution> + + <objectContribution id="org.eclipse.m2e.classpathMenuWrapper.materializeAction" + objectClass="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer$RequiredProjectWrapper" + adaptable="true"> + <action id="org.eclipse.m2e.materializeAction" + class="org.eclipse.m2e.scm.internal.actions.MaterializeAction" + label="%m2.popup.MaterializeAction" + style="push" + menubarPath="org.eclipse.m2e.classpathMenuWrapper/import" + enablesFor="+"/> + <enablement> + <and> + <test property="org.eclipse.m2e.hasArtifactKey"/> + <not> + <test property="org.eclipse.m2e.hasProjectArtifactKey"/> + </not> + </and> + </enablement> + </objectContribution> </extension> |