#965 follow-up

modules/ExportPluginUI/src/main/java/org/gephi/ui/exporter/plugin/UIExporterGEXFPanel.form

@@ -16,27 +16,33 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="labelExport" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="attributesExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="sizeExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="colorsExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="positionExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="dynamicExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                  </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="normalizeCheckbox" min="-2" max="-2" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="labelNormalize" pref="225" max="32767" attributes="0"/>
                   </Group>
+                  <Group type="102" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="labelExport" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace type="separate" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="attributesExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="sizeExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="colorsExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="positionExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Component id="dynamicExportCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                          </Group>
+                          <Component id="includeAttValuesNullCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
               </Group>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -61,7 +67,9 @@
                   <Component id="normalizeCheckbox" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="labelNormalize" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="78" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="includeAttValuesNullCheckbox" min="-2" max="-2" attributes="0"/>
+              <EmptySpace pref="51" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -129,5 +137,12 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JCheckBox" name="includeAttValuesNullCheckbox">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/gephi/ui/exporter/plugin/Bundle.properties" key="UIExporterGEXFPanel.includeAttValuesNullCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>

modules/ExportPluginUI/src/main/java/org/gephi/ui/exporter/plugin/UIExporterGEXFPanel.java

@@ -53,6 +53,7 @@ public class UIExporterGEXFPanel extends javax.swing.JPanel {
     private javax.swing.JCheckBox attributesExportCheckbox;
     private javax.swing.JCheckBox colorsExportCheckbox;
     private javax.swing.JCheckBox dynamicExportCheckbox;
+    private javax.swing.JCheckBox includeAttValuesNullCheckbox;
     private javax.swing.JLabel labelExport;
     private javax.swing.JLabel labelNormalize;
     private javax.swing.JCheckBox normalizeCheckbox;
@@ -74,6 +75,7 @@ public class UIExporterGEXFPanel extends javax.swing.JPanel {
         attributesExportCheckbox.setSelected(exporterGEXF.isExportAttributes());
         normalizeCheckbox.setSelected(exporterGEXF.isNormalize());
         dynamicExportCheckbox.setSelected(exporterGEXF.isExportDynamic());
+        includeAttValuesNullCheckbox.setSelected(exporterGEXF.isIncludeNullAttValues());
     }
 
     public void unsetup(ExporterGEXF exporterGEXF) {
@@ -83,6 +85,7 @@ public class UIExporterGEXFPanel extends javax.swing.JPanel {
         exporterGEXF.setExportPosition(positionExportCheckbox.isSelected());
         exporterGEXF.setNormalize(normalizeCheckbox.isSelected());
         exporterGEXF.setExportDynamic(dynamicExportCheckbox.isSelected());
+        exporterGEXF.setIncludeNullAttValues(includeAttValuesNullCheckbox.isSelected());
     }
 
     /**
@@ -102,75 +105,76 @@ public class UIExporterGEXFPanel extends javax.swing.JPanel {
         labelNormalize = new javax.swing.JLabel();
         normalizeCheckbox = new javax.swing.JCheckBox();
         dynamicExportCheckbox = new javax.swing.JCheckBox();
+        includeAttValuesNullCheckbox = new javax.swing.JCheckBox();
 
-        labelExport.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.labelExport.text")); // NOI18N
+        labelExport.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.labelExport.text")); // NOI18N
 
-        positionExportCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.positionExportCheckbox.text")); // NOI18N
+        positionExportCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.positionExportCheckbox.text")); // NOI18N
 
-        colorsExportCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.colorsExportCheckbox.text")); // NOI18N
+        colorsExportCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.colorsExportCheckbox.text")); // NOI18N
 
-        attributesExportCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.attributesExportCheckbox.text")); // NOI18N
+        attributesExportCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.attributesExportCheckbox.text")); // NOI18N
 
-        sizeExportCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.sizeExportCheckbox.text")); // NOI18N
+        sizeExportCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.sizeExportCheckbox.text")); // NOI18N
 
         labelNormalize.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
         labelNormalize.setForeground(new java.awt.Color(102, 102, 102));
-        labelNormalize.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.labelNormalize.text")); // NOI18N
+        labelNormalize.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.labelNormalize.text")); // NOI18N
 
-        normalizeCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.normalizeCheckbox.text")); // NOI18N
+        normalizeCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.normalizeCheckbox.text")); // NOI18N
 
-        dynamicExportCheckbox.setText(org.openide.util.NbBundle
-            .getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.dynamicExportCheckbox.text")); // NOI18N
+        dynamicExportCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.dynamicExportCheckbox.text")); // NOI18N
+
+        includeAttValuesNullCheckbox.setText(org.openide.util.NbBundle.getMessage(UIExporterGEXFPanel.class, "UIExporterGEXFPanel.includeAttValuesNullCheckbox.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .addGroup(layout.createSequentialGroup()
-                    .addContainerGap()
-                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addGroup(layout.createSequentialGroup()
-                            .addComponent(labelExport)
-                            .addGap(18, 18, 18)
-                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                .addComponent(attributesExportCheckbox)
-                                .addComponent(sizeExportCheckbox)
-                                .addComponent(colorsExportCheckbox)
-                                .addComponent(positionExportCheckbox)
-                                .addComponent(dynamicExportCheckbox)))
-                        .addGroup(layout.createSequentialGroup()
-                            .addComponent(normalizeCheckbox)
-                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                            .addComponent(labelNormalize, javax.swing.GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE)))
-                    .addContainerGap())
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(normalizeCheckbox)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(labelNormalize, javax.swing.GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(labelExport)
+                                .addGap(18, 18, 18)
+                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                    .addComponent(attributesExportCheckbox)
+                                    .addComponent(sizeExportCheckbox)
+                                    .addComponent(colorsExportCheckbox)
+                                    .addComponent(positionExportCheckbox)
+                                    .addComponent(dynamicExportCheckbox)))
+                            .addComponent(includeAttValuesNullCheckbox))
+                        .addGap(0, 0, Short.MAX_VALUE)))
+                .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                .addGroup(layout.createSequentialGroup()
-                    .addContainerGap()
-                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                        .addComponent(labelExport)
-                        .addComponent(positionExportCheckbox))
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                    .addComponent(colorsExportCheckbox)
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                    .addComponent(sizeExportCheckbox)
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                    .addComponent(attributesExportCheckbox)
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                    .addComponent(dynamicExportCheckbox)
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                        .addComponent(normalizeCheckbox)
-                        .addComponent(labelNormalize))
-                    .addContainerGap(78, Short.MAX_VALUE))
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(labelExport)
+                    .addComponent(positionExportCheckbox))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(colorsExportCheckbox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(sizeExportCheckbox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(attributesExportCheckbox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(dynamicExportCheckbox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(normalizeCheckbox)
+                    .addComponent(labelNormalize))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(includeAttValuesNullCheckbox)
+                .addContainerGap(51, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 }