Duplicate resources are now handled properly

mcmil · Sep 13, 2014 · 3efb1d5 · 3efb1d5
1 parent a426a56
commit 3efb1d5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,39 +1,38 @@
 <idea-plugin version="2">
-  <id>pl.cmil.wuff.plugin</id>
-  <name>Wuff IntelliJ Plugin</name>
-  <version>0.1.0</version>
-  <vendor email="cmilmichal@gmail.com" url="https://github.com/mcmil/wuff-intellij-plugin">Michal Ćmil</vendor>
+    <id>pl.cmil.wuff.plugin</id>
+    <name>Wuff IntelliJ Plugin</name>
+    <version>0.1.0</version>
+    <vendor email="cmilmichal@gmail.com" url="https://github.com/mcmil/wuff-intellij-plugin">Michal Ćmil</vendor>
 
-  <description><![CDATA[
+    <description><![CDATA[
   A plugin which attempts to ease Eclipse E4 development using Wuff in IntelliJ IDEA.
     ]]></description>
 
-  <change-notes><![CDATA[
-      Initial release
+    <change-notes><![CDATA[
+      Initial release. Provides Wuff Run Configuration which allows to make changes in the application without a full gradle build.
     ]]>
-  </change-notes>
+    </change-notes>
 
-  <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-  <idea-version since-build="135"/>
+    <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
+    <idea-version since-build="135"/>
 
 
+    <extensions defaultExtensionNs="com.intellij">
+        <!-- Add your extensions here -->
+        <configurationType implementation="pl.cmil.wuff.plugin.WuffConfigurationType"/>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-      <configurationType implementation="pl.cmil.wuff.plugin.WuffConfigurationType"/>
+    </extensions>
 
-  </extensions>
+    <application-components>
+        <!-- Add your application components here -->
+    </application-components>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
+    <project-components>
+        <!-- Add your project components here -->
+    </project-components>
 
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
+    <actions>
+        <!-- Add your actions here -->
+    </actions>
 
 </idea-plugin>
diff --git a/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java b/src/pl/cmil/wuff/plugin/EquinoxJavaCommandLineState.java
@@ -13,6 +13,8 @@
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.tools.ant.taskdefs.Jar;
+import org.apache.tools.ant.taskdefs.Zip;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
 import org.jetbrains.annotations.NotNull;
 
@@ -96,6 +98,7 @@ private void rebuildModuleJar(Module module) throws ExecutionException {
 
         if (isProjectPrebuiltByGradle(manifestFile)) {
             Jar moduleJar = new Jar();
+            moduleJar.setDuplicate((Zip.Duplicate) Zip.Duplicate.getInstance(Zip.Duplicate.class, "preserve"));
             moduleJar.setProject(new org.apache.tools.ant.Project());
             moduleJar.setManifest(manifestFile);
 
@@ -118,9 +121,9 @@ private void rebuildModuleJar(Module module) throws ExecutionException {
     }
 
     private void addDirectoryToJar(Jar moduleJar, File dir) {
-        FileSet classSet = new FileSet();
-        classSet.setDir(dir);
-        moduleJar.addFileset(classSet);
+        FileSet fileSet = new FileSet();
+        fileSet.setDir(dir);
+        moduleJar.addFileset(fileSet);
     }
 
     private boolean isProjectPrebuiltByGradle(File manifestFile) {