Skip to content

Commit 683c30c

Browse files
mbastianmbastian
committed
Add more options in the import report panel
1 parent b66ff8c commit 683c30c

11 files changed

Lines changed: 496 additions & 187 deletions

File tree

‎modules/DesktopImport/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
<groupId>${project.groupId}</groupId>
7373
<artifactId>core-library-wrapper</artifactId>
7474
</dependency>
75+
<dependency>
76+
<groupId>${project.groupId}</groupId>
77+
<artifactId>ui-library-wrapper</artifactId>
78+
</dependency>
7579
</dependencies>
7680

7781
<build>

‎modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ public void fatalError(Throwable t) {
115115
// }
116116
// NotifyDescriptor.Message msg = new NotifyDescriptor.Message(message, NotifyDescriptor.WARNING_MESSAGE);
117117
// DialogDisplayer.getDefault().notify(msg);
118-
Logger.getLogger("").log(Level.SEVERE, "", t.getCause());
118+
Exceptions.printStackTrace(t);
119+
t.printStackTrace();
119120
}
120121
};
121122
executor = new LongTaskExecutor(true, "Importer", 10);

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

Lines changed: 130 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Group type="102" attributes="0">
2424
<EmptySpace max="-2" attributes="0"/>
2525
<Group type="103" groupAlignment="0" attributes="0">
26-
<Component id="tabbedPane" alignment="0" max="32767" attributes="0"/>
26+
<Component id="tabbedPane" alignment="0" pref="609" max="32767" attributes="0"/>
2727
<Group type="102" alignment="0" attributes="0">
2828
<Component id="labelSrc" min="-2" max="-2" attributes="0"/>
2929
<EmptySpace max="-2" attributes="0"/>
@@ -33,20 +33,22 @@
3333
<Group type="103" groupAlignment="0" attributes="0">
3434
<Group type="102" attributes="0">
3535
<Component id="labelGraphType" min="-2" max="-2" attributes="0"/>
36-
<EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
37-
<Component id="graphTypeCombo" min="-2" pref="107" max="-2" attributes="1"/>
36+
<EmptySpace type="separate" max="-2" attributes="0"/>
37+
<Component id="graphTypeCombo" min="-2" pref="152" max="-2" attributes="1"/>
38+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
3839
</Group>
39-
<Component id="jPanel1" max="32767" attributes="1"/>
40+
<Component id="statsPanel" max="32767" attributes="1"/>
4041
</Group>
4142
<EmptySpace max="32767" attributes="0"/>
42-
<Group type="103" groupAlignment="1" attributes="0">
43-
<Group type="103" groupAlignment="0" max="-2" attributes="0">
44-
<Component id="createMissingNodesCheckbox" alignment="1" max="32767" attributes="1"/>
45-
<Component id="autoscaleCheckbox" alignment="1" max="32767" attributes="1"/>
43+
<Group type="103" groupAlignment="0" attributes="0">
44+
<Component id="processorPanel" alignment="1" min="-2" pref="175" max="-2" attributes="0"/>
45+
<Group type="102" alignment="1" attributes="0">
46+
<Component id="moreOptionsLink" min="-2" max="-2" attributes="0"/>
47+
<EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
4648
</Group>
47-
<Component id="processorPanel" min="-2" pref="175" max="-2" attributes="0"/>
4849
</Group>
4950
</Group>
51+
<Component id="moreOptionsPanel" max="32767" attributes="0"/>
5052
</Group>
5153
<EmptySpace max="-2" attributes="0"/>
5254
</Group>
@@ -61,23 +63,21 @@
6163
<Component id="sourceLabel" alignment="3" min="-2" max="-2" attributes="0"/>
6264
</Group>
6365
<EmptySpace type="separate" max="-2" attributes="0"/>
64-
<Component id="tabbedPane" pref="137" max="32767" attributes="0"/>
65-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
66+
<Component id="tabbedPane" min="-2" pref="160" max="-2" attributes="0"/>
67+
<EmptySpace max="-2" attributes="0"/>
6668
<Group type="103" groupAlignment="3" attributes="0">
6769
<Component id="labelGraphType" alignment="3" min="-2" max="-2" attributes="0"/>
68-
<Component id="autoscaleCheckbox" alignment="3" min="-2" max="-2" attributes="0"/>
6970
<Component id="graphTypeCombo" alignment="3" min="-2" max="-2" attributes="0"/>
71+
<Component id="moreOptionsLink" alignment="3" min="-2" max="-2" attributes="0"/>
7072
</Group>
7173
<EmptySpace max="-2" attributes="0"/>
72-
<Group type="103" groupAlignment="1" attributes="0">
73-
<Group type="102" alignment="0" attributes="0">
74-
<Component id="createMissingNodesCheckbox" min="-2" max="-2" attributes="0"/>
75-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
76-
<Component id="processorPanel" pref="62" max="32767" attributes="1"/>
77-
<EmptySpace max="-2" attributes="0"/>
78-
</Group>
79-
<Component id="jPanel1" alignment="0" min="-2" pref="98" max="-2" attributes="0"/>
74+
<Component id="moreOptionsPanel" min="-2" max="-2" attributes="0"/>
75+
<EmptySpace max="-2" attributes="0"/>
76+
<Group type="103" groupAlignment="0" attributes="0">
77+
<Component id="processorPanel" max="32767" attributes="1"/>
78+
<Component id="statsPanel" pref="121" max="32767" attributes="0"/>
8079
</Group>
80+
<EmptySpace max="-2" attributes="0"/>
8181
</Group>
8282
</Group>
8383
</DimensionLayout>
@@ -151,38 +151,12 @@
151151
</Properties>
152152
</Component>
153153
<Component class="javax.swing.JComboBox" name="graphTypeCombo">
154-
<Properties>
155-
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
156-
<StringArray count="3">
157-
<StringItem index="0" value="Directed"/>
158-
<StringItem index="1" value="Undirected"/>
159-
<StringItem index="2" value="Mixed"/>
160-
</StringArray>
161-
</Property>
162-
</Properties>
163-
</Component>
164-
<Component class="javax.swing.JCheckBox" name="autoscaleCheckbox">
165-
<Properties>
166-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
167-
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.autoscaleCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
168-
</Property>
169-
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
170-
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.autoscaleCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
171-
</Property>
172-
</Properties>
173154
</Component>
174155
<Container class="javax.swing.JPanel" name="processorPanel">
175156

176157
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
177158
</Container>
178-
<Component class="javax.swing.JCheckBox" name="createMissingNodesCheckbox">
179-
<Properties>
180-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
181-
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.createMissingNodesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
182-
</Property>
183-
</Properties>
184-
</Component>
185-
<Container class="javax.swing.JPanel" name="jPanel1">
159+
<Container class="javax.swing.JPanel" name="statsPanel">
186160

187161
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
188162
<SubComponents>
@@ -288,5 +262,114 @@
288262
</Component>
289263
</SubComponents>
290264
</Container>
265+
<Component class="org.jdesktop.swingx.JXHyperlink" name="moreOptionsLink">
266+
<Properties>
267+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
268+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.moreOptionsLink.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
269+
</Property>
270+
</Properties>
271+
</Component>
272+
<Container class="javax.swing.JPanel" name="moreOptionsPanel">
273+
<Properties>
274+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
275+
<Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
276+
<EtchetBorder/>
277+
</Border>
278+
</Property>
279+
</Properties>
280+
281+
<Layout>
282+
<DimensionLayout dim="0">
283+
<Group type="103" groupAlignment="0" attributes="0">
284+
<Group type="102" attributes="0">
285+
<EmptySpace max="-2" attributes="0"/>
286+
<Group type="103" groupAlignment="0" attributes="0">
287+
<Group type="102" attributes="0">
288+
<Component id="selfLoopCheckBox" min="-2" max="-2" attributes="0"/>
289+
<EmptySpace max="32767" attributes="0"/>
290+
<Component id="labelParallelEdgesMergeStrategy" min="-2" max="-2" attributes="0"/>
291+
<EmptySpace max="-2" attributes="0"/>
292+
<Component id="edgesMergeStrategyCombo" min="-2" pref="111" max="-2" attributes="0"/>
293+
</Group>
294+
<Group type="102" attributes="0">
295+
<Group type="103" groupAlignment="0" attributes="0">
296+
<Component id="createMissingNodesCheckbox" min="-2" max="-2" attributes="1"/>
297+
<Component id="autoscaleCheckbox" alignment="0" min="-2" pref="168" max="-2" attributes="1"/>
298+
</Group>
299+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
300+
</Group>
301+
</Group>
302+
<EmptySpace max="-2" attributes="0"/>
303+
</Group>
304+
</Group>
305+
</DimensionLayout>
306+
<DimensionLayout dim="1">
307+
<Group type="103" groupAlignment="0" attributes="0">
308+
<Group type="102" alignment="0" attributes="0">
309+
<EmptySpace max="-2" attributes="0"/>
310+
<Group type="103" groupAlignment="3" attributes="0">
311+
<Component id="selfLoopCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
312+
<Group type="103" alignment="3" groupAlignment="3" attributes="0">
313+
<Component id="labelParallelEdgesMergeStrategy" alignment="3" min="-2" max="-2" attributes="0"/>
314+
<Component id="edgesMergeStrategyCombo" alignment="3" min="-2" max="-2" attributes="0"/>
315+
</Group>
316+
</Group>
317+
<EmptySpace max="-2" attributes="0"/>
318+
<Component id="autoscaleCheckbox" min="-2" max="-2" attributes="0"/>
319+
<EmptySpace max="-2" attributes="0"/>
320+
<Component id="createMissingNodesCheckbox" min="-2" max="-2" attributes="0"/>
321+
<EmptySpace max="32767" attributes="0"/>
322+
</Group>
323+
</Group>
324+
</DimensionLayout>
325+
</Layout>
326+
<SubComponents>
327+
<Component class="javax.swing.JCheckBox" name="autoscaleCheckbox">
328+
<Properties>
329+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
330+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.autoscaleCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
331+
</Property>
332+
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
333+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.autoscaleCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
334+
</Property>
335+
</Properties>
336+
</Component>
337+
<Component class="javax.swing.JCheckBox" name="createMissingNodesCheckbox">
338+
<Properties>
339+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
340+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.createMissingNodesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
341+
</Property>
342+
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
343+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.createMissingNodesCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
344+
</Property>
345+
</Properties>
346+
</Component>
347+
<Component class="javax.swing.JCheckBox" name="selfLoopCheckBox">
348+
<Properties>
349+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
350+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.selfLoopCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
351+
</Property>
352+
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
353+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.selfLoopCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
354+
</Property>
355+
<Property name="horizontalTextPosition" type="int" value="4"/>
356+
</Properties>
357+
</Component>
358+
<Component class="javax.swing.JLabel" name="labelParallelEdgesMergeStrategy">
359+
<Properties>
360+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
361+
<ResourceString bundle="org/gephi/desktop/importer/Bundle.properties" key="ReportPanel.labelParallelEdgesMergeStrategy.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
362+
</Property>
363+
</Properties>
364+
</Component>
365+
<Component class="javax.swing.JComboBox" name="edgesMergeStrategyCombo">
366+
<Properties>
367+
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
368+
<StringArray count="0"/>
369+
</Property>
370+
</Properties>
371+
</Component>
372+
</SubComponents>
373+
</Container>
291374
</SubComponents>
292375
</Form>

0 commit comments

Comments
 (0)