Centralize commons and jfreechart dependencies in new wrapper modules. Add...

Centralize commons and jfreechart dependencies in new wrapper modules. Add swinglabs and other librairies as public packages in UI Components. Reduce the number of librariries dependencies.

.gitignore

@@ -90,4 +90,6 @@ keystore.ks
 /modules/VisualizationAPI/target/
 /modules/VisualizationImpl/target/
 /modules/WelcomeScreen/target/
-/modules/WorkspaceUI/target/
\ No newline at end of file
+/modules/WorkspaceUI/target/
+/modules/JFreeChartWrapper/target/
+/modules/CommonsWrapper/target/
\ No newline at end of file

modules/CommonsWrapper/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>gephi-parent</artifactId>
+        <groupId>org.gephi</groupId>
+        <version>0.8.2-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <groupId>org.gephi</groupId>
+    <artifactId>commons-wrapper</artifactId>
+    <version>0.8.2-SNAPSHOT</version>
+    <packaging>nbm</packaging>
+
+    <name>CommonsWrapper</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>nbm-maven-plugin</artifactId>
+                <configuration>
+                    <publicPackages>
+                        <publicPackage>org.apache.commons.codec.*</publicPackage>
+                    </publicPackages>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/CommonsWrapper/src/main/nbm/manifest.mf

+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/commons/Bundle.properties

modules/CommonsWrapper/src/main/nbm/module.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+    <!--
+    <moduleType>autoload</moduleType>
+    <codeNameBase>org.gephi.lib.commons/1</codeNameBase>
+    <licenseName>Apache License, Version 2.0</licenseName>
+    <licenseFile>license.txt</licenseFile>
+    -->
+</nbm>

modules/CommonsWrapper/src/main/resources/org/gephi/lib/commons/Bundle.properties

+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=

modules/DataLaboratoryPlugin/pom.xml

@@ -48,7 +48,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ui-components</artifactId>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -71,14 +70,8 @@
             <artifactId>org-openide-windows</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

modules/DesktopContext/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -28,6 +28,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>utils-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
@@ -44,11 +48,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-awt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>

modules/DesktopDataLaboratory/pom.xml

@@ -80,11 +80,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-swing-outline</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-windows</artifactId>

modules/DesktopDataLaboratory/src/main/java/org/gephi/desktop/datalab/DataTableTopComponent.java

@@ -74,7 +74,7 @@ import org.gephi.desktop.datalab.general.actions.MergeColumnsUI;
 import org.gephi.graph.api.*;
 import org.gephi.project.api.*;
 import org.gephi.ui.components.WrapLayout;
-import org.gephi.ui.utils.BusyUtils;
+import org.gephi.ui.components.BusyUtils;
 import org.gephi.ui.utils.DialogFileFilter;
 import org.gephi.ui.utils.UIUtils;
 import org.gephi.utils.TableCSVExporter;

modules/DesktopHierarchy/pom.xml

@@ -56,11 +56,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-filesystems</artifactId>

modules/DesktopHierarchy/src/main/java/org/gephi/desktop/hierarchy/HierarchyTopComponent.java

@@ -50,8 +50,8 @@ import javax.swing.SwingUtilities;
 import org.gephi.graph.api.GraphController;
 import org.gephi.graph.api.GraphModel;
 import org.gephi.graph.api.HierarchicalGraph;
-import org.gephi.ui.utils.BusyUtils;
-import org.gephi.ui.utils.BusyUtils.BusyLabel;
+import org.gephi.ui.components.BusyUtils;
+import org.gephi.ui.components.BusyUtils.BusyLabel;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;

modules/DesktopImport/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>utils-ui</artifactId>
+            <artifactId>ui-components</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -69,9 +69,8 @@
             <artifactId>org-netbeans-swing-outline</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.1</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>commons-wrapper</artifactId>
         </dependency>
     </dependencies>
 

modules/DesktopImport/src/main/java/org/gephi/desktop/importer/ReportPanel.java

@@ -42,7 +42,6 @@
 package org.gephi.desktop.importer;
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
 import java.awt.event.ItemEvent;
@@ -68,7 +67,7 @@ import org.gephi.io.importer.api.Issue;
 import org.gephi.io.importer.api.Report;
 import org.gephi.io.processor.spi.Processor;
 import org.gephi.io.processor.spi.ProcessorUI;
-import org.gephi.ui.utils.BusyUtils;
+import org.gephi.ui.components.BusyUtils;
 import org.netbeans.swing.outline.DefaultOutlineModel;
 import org.netbeans.swing.outline.OutlineModel;
 import org.netbeans.swing.outline.RenderDataProvider;

modules/DesktopPartition/pom.xml

@@ -16,11 +16,6 @@
     <name>DesktopPartition</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>project-api</artifactId>
@@ -29,10 +24,18 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>partition-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ui-components</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>utils-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-awt</artifactId>
@@ -53,11 +56,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-filesystems</artifactId>

modules/DesktopPartition/src/main/java/org/gephi/desktop/partition/PartitionChooser.java

@@ -60,8 +60,8 @@ import org.gephi.partition.api.PartitionController;
 import org.gephi.partition.api.PartitionModel;
 import org.gephi.partition.spi.Transformer;
 import org.gephi.partition.spi.TransformerUI;
-import org.gephi.ui.utils.BusyUtils;
-import org.gephi.ui.utils.BusyUtils.BusyLabel;
+import org.gephi.ui.components.BusyUtils;
+import org.gephi.ui.components.BusyUtils.BusyLabel;
 import org.jdesktop.swingx.JXBusyLabel;
 import org.gephi.ui.utils.UIUtils;
 import org.openide.util.Lookup;

modules/DesktopPreview/pom.xml

@@ -80,22 +80,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.processing</groupId>
-            <artifactId>core</artifactId>
-            <version>1.5.1</version>
-        </dependency>
-        <dependency>
-            <artifactId>xml-apis</artifactId>
-            <groupId>xml-apis</groupId>
-            <type>jar</type>
-            <version>1.3.04</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/DesktopRanking/pom.xml

@@ -52,11 +52,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-awt</artifactId>

modules/DesktopStatistics/pom.xml

@@ -64,11 +64,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-awt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>

modules/DesktopTimeline/pom.xml

@@ -77,11 +77,6 @@
             <artifactId>joda-time</artifactId>
             <version>2.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-filesystems</artifactId>

modules/DesktopTools/pom.xml

@@ -28,6 +28,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>utils-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ui-components</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
@@ -40,11 +44,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>visualization-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jdesktop</groupId>
-            <artifactId>beansbinding</artifactId>
-            <version>1.2.1</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/ExportPluginUI/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -28,6 +28,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>export-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ui-components</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
@@ -36,11 +40,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jdesktop</groupId>
-            <artifactId>beansbinding</artifactId>
-            <version>1.2.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>validation-api</artifactId>

modules/FiltersPluginUI/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -56,11 +56,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-windows</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>desktop-perspective</artifactId>

modules/JFreeChartWrapper/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>gephi-parent</artifactId>
+        <groupId>org.gephi</groupId>
+        <version>0.8.2-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <groupId>org.gephi</groupId>
+    <artifactId>jfreechart-wrapper</artifactId>
+    <version>0.8.2-SNAPSHOT</version>
+    <packaging>nbm</packaging>
+
+    <name>JFreeChartWrapper</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+            <version>1.0.13</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>nbm-maven-plugin</artifactId>
+                <configuration>
+                    <publicPackages>
+                        <publicPackage>org.jfree.*</publicPackage>
+                    </publicPackages>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

modules/JFreeChartWrapper/src/main/nbm/manifest.mf

+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/jfreechart/Bundle.properties

modules/JFreeChartWrapper/src/main/nbm/module.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+    <!--
+    <moduleType>autoload</moduleType>
+    <codeNameBase>org.gephi.lib.jfreechart/1</codeNameBase>
+    <licenseName>Apache License, Version 2.0</licenseName>
+    <licenseFile>license.txt</licenseFile>
+    -->
+</nbm>

modules/JFreeChartWrapper/src/main/resources/org/gephi/lib/jfreechart/Bundle.properties

+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=

modules/PreviewAPI/pom.xml

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-bridge</artifactId>
+            <artifactId>batik-transcoder</artifactId>
             <version>1.7</version>
             <exclusions>
                 <exclusion>
@@ -75,6 +75,13 @@
                         <publicPackage>org.gephi.preview.spi</publicPackage>
                         <publicPackage>org.gephi.preview.types</publicPackage>
                         <publicPackage>org.gephi.preview.types.propertyeditors</publicPackage>
+                        <publicPackage>com.itextpdf.text.*</publicPackage>
+                        <publicPackage>processing.*</publicPackage>
+                        <publicPackage>org.apache.batik.*</publicPackage>
+                        <publicPackage>org.apache.xpath.*</publicPackage>
+                        <publicPackage>org.apache.xalan.*</publicPackage>
+                        <publicPackage>org.apache.xml.*</publicPackage>
+                        <publicPackage>org.w3c.*</publicPackage>
                     </publicPackages>
                 </configuration>
             </plugin>

modules/PreviewExport/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -20,11 +20,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>export-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.processing</groupId>
-            <artifactId>core</artifactId>
-            <version>1.5.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>preview-api</artifactId>
@@ -45,33 +40,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-transcoder</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.xmlgraphics</groupId>
-                    <artifactId>batik-js</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-bridge</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.xmlgraphics</groupId>
-                    <artifactId>batik-js</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.2.0</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/PreviewExportUI/pom.xml

@@ -20,14 +20,17 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>export-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>preview-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>preview-export</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.2.0</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ui-components</artifactId>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
@@ -37,21 +40,10 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
-        <dependency>
-            <artifactId>xml-apis</artifactId>
-            <groupId>xml-apis</groupId>
-            <type>jar</type>
-            <version>1.3.04</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/PreviewPlugin/pom.xml

@@ -48,28 +48,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.processing</groupId>
-            <artifactId>core</artifactId>
-            <version>1.5.1</version>
-        </dependency>
-        <dependency>
-            <artifactId>xml-apis</artifactId>
-            <groupId>xml-apis</groupId>
-            <type>jar</type>
-            <version>1.3.04</version>
-        </dependency>
-        <dependency>
-            <artifactId>xml-apis-ext</artifactId>
-            <groupId>xml-apis</groupId>
-            <type>jar</type>
-            <version>1.3.04</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/ProcessorPluginUI/pom.xml

@@ -36,6 +36,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>project-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ui-components</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util</artifactId>
@@ -44,16 +48,6 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-util-lookup</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jdesktop</groupId>
-            <artifactId>beansbinding</artifactId>
-            <version>1.2.1</version>
-        </dependency>
     </dependencies>
 
     <build>

modules/StatisticsAPI/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -49,9 +49,9 @@
             <artifactId>org-openide-util-lookup</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.6</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>commons-wrapper</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

modules/StatisticsPlugin/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -45,9 +45,8 @@
             <artifactId>utils-longtask</artifactId>
         </dependency>
         <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>

modules/UIComponents/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -17,9 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.6</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>commons-wrapper</artifactId>
         </dependency>
         <dependency>
             <groupId>org.pushingpixels</groupId>
@@ -30,15 +29,19 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>utils-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.swinglabs</groupId>
             <artifactId>swingx</artifactId>
             <version>1.6.1</version>
         </dependency>
         <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
+            <groupId>org.jdesktop</groupId>
+            <artifactId>beansbinding</artifactId>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
@@ -90,6 +93,8 @@
                         <publicPackage>org.gephi.ui.components.gradientslider</publicPackage>
                         <publicPackage>org.gephi.ui.components.richtooltip</publicPackage>
                         <publicPackage>org.pushingpixels.flamingo.*</publicPackage>
+                        <publicPackage>org.jdesktop.swingx.*</publicPackage>
+                        <publicPackage>org.jdesktop.beansbinding.*</publicPackage>
                     </publicPackages>
                 </configuration>
             </plugin>

modules/UIUtils/src/main/java/org/gephi/ui/utils/BusyUtils.java → modules/UIComponents/src/main/java/org/gephi/ui/components/BusyUtils.java

@@ -39,7 +39,7 @@ Contributor(s):
 
 Portions Copyrighted 2011 Gephi Consortium.
 */
-package org.gephi.ui.utils;
+package org.gephi.ui.components;
 
 import java.awt.Dimension;
 import javax.swing.JComponent;

modules/UIUtils/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -33,14 +33,8 @@
             <artifactId>validation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.13</version>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
         </dependency>
     </dependencies>
 

modules/VisualizationImpl/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>
@@ -94,11 +94,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>gleem</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>utils-collection</artifactId>

modules/WelcomeScreen/pom.xml

@@ -32,11 +32,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>project-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.swinglabs</groupId>
-            <artifactId>swingx</artifactId>
-            <version>1.6.1</version>
-        </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-netbeans-modules-settings</artifactId>

modules/WorkspaceUI/pom.xml

@@ -5,7 +5,7 @@
         <artifactId>gephi-parent</artifactId>
         <groupId>org.gephi</groupId>
         <version>0.8.2-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <groupId>org.gephi</groupId>

modules/application/pom.xml

@@ -379,6 +379,14 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>clustering-plugin</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jfreechart-wrapper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>commons-wrapper</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -727,6 +727,16 @@
                 <artifactId>clustering-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>jfreechart-wrapper</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>commons-wrapper</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1158,5 +1168,7 @@
         <module>modules/WelcomeScreen</module>
         <module>modules/WorkspaceUI</module>
         <module>modules/Gleem</module>
+        <module>modules/JFreeChartWrapper</module>
+        <module>modules/CommonsWrapper</module>
     </modules>
 </project>
\ No newline at end of file