Author: simoneg
Date: Mon Oct 5 22:57:25 2009
New Revision: 822076
URL: http://svn.apache.org/viewvc?rev=822076&view=rev
Log:
LABS-477 : magma packaging only if it is not already magma*
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Modified:
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java?rev=822076&r1=822075&r2=822076&view=diff
==============================================================================
---
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
(original)
+++
labs/magma/trunk/magma-eclipse/src/org/apache/magma/tools/magmaeclipse/basics/MagmaPDEUtils.java
Mon Oct 5 22:57:25 2009
@@ -46,6 +46,7 @@
import org.eclipse.ui.progress.UIJob;
import org.maven.ide.eclipse.MavenPlugin;
import org.maven.ide.eclipse.core.IMavenConstants;
+import org.maven.ide.eclipse.embedder.MavenModelManager;
import org.maven.ide.eclipse.embedder.ProjectUpdater;
import org.maven.ide.eclipse.project.IMavenProjectFacade;
import org.maven.ide.eclipse.project.ResolverConfiguration;
@@ -462,9 +463,12 @@
MavenPlugin.getDefault().getMavenModelManager().
updateProject(pomFile, new ProjectUpdater() {
public void update(Model model) {
- model.setPackaging("magma");
+ String prepack = model.getPackaging();
+ if (prepack == null ||
!prepack.startsWith("magma")) {
+ model.setPackaging("magma");
+ }
}
- });
+ });
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
