From f86ed6a05f8c667d064bf8fdffe675549e2aae79 Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Date: Tue, 15 Aug 2017 21:41:31 +0200 Subject: [PATCH] Cleaning up some code --- .../plugin/palette/PaletteManager.java | 17 ++--- .../PartitionElementColorTransformerUI.java | 2 +- .../PartitionLabelColorTransformerUI.java | 2 +- .../plugin/RankingLabelSizeTransformerUI.java | 2 +- .../ui/appearance/plugin/RecentPalettes.java | 31 ++++----- .../desktop/appearance/AppearanceUIModel.java | 63 ------------------- .../gephi/desktop/banner/BannerComponent.java | 5 +- .../desktop/CommandLineProcessor.java | 9 +-- .../desktop/DragNDropFrameAdapter.java | 2 +- .../desktop/reporter/ReportController.java | 5 +- .../desktop/reporter/ViewDataPanel.java | 3 +- .../desktop/filters/query/QueryChildren.java | 7 +-- .../gephi/desktop/filters/query/RootNode.java | 7 +-- .../importer/DesktopImportControllerUI.java | 7 --- .../project/ProjectControllerUIImpl.java | 2 +- .../swing/dirchooser/DirectoryChooserUI.java | 3 +- .../swing/dirchooser/DirectoryNode.java | 5 +- .../FilterModelPersistenceProvider.java | 5 +- .../gephi/filters/GenericPropertyEditor.java | 5 +- .../plugin/dynamic/DynamicRangeBuilder.java | 3 +- .../filters/plugin/graph/EgoBuilder.java | 3 +- .../plugin/graph/NeighborsBuilder.java | 3 +- .../plugin/attribute/EqualBooleanPanel.java | 3 +- .../plugin/attribute/EqualNumberPanel.java | 3 +- .../plugin/attribute/EqualStringPanel.java | 7 ++- .../ui/filters/plugin/graph/KCorePanel.java | 3 +- .../plugin/partition/PartitionPanel.java | 13 +--- .../importer/plugin/file/ImporterPajek.java | 1 - .../plugin/EdgeListDatabaseManager.java | 15 ++--- .../org/gephi/layout/LayoutModelImpl.java | 4 +- .../org/gephi/layout/plugin/AutoLayout.java | 2 +- .../gephi/layout/plugin/openord/Combine.java | 3 +- .../gephi/statistics/StatisticsModelImpl.java | 5 +- .../plugin/EigenvectorCentralityPanel.java | 5 +- .../plugin/edit/EditWindowControllerImpl.java | 3 +- .../gephi/ui/components/SimpleHTMLReport.java | 13 ++-- .../gradientslider/MultiThumbSlider.java | 3 +- .../main/java/org/gephi/ui/utils/UIUtils.java | 7 +-- .../opengl/GraphicalConfiguration.java | 7 ++- .../desktop/welcome/WelcomeTopComponent.java | 2 +- 40 files changed, 115 insertions(+), 175 deletions(-) diff --git a/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteManager.java b/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteManager.java index 9c1fef8fed..b27af4ac9e 100644 --- a/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteManager.java +++ b/modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteManager.java @@ -237,7 +237,7 @@ private void retrieve() { Color[] colors = deserializeColors(cols); recentPalette.addLast(new Palette(colors)); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } else { break; @@ -259,7 +259,7 @@ private void store() { try { prefs.putByteArray(COLORS + i, serializeColors(palette.getColors())); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } i++; } @@ -267,17 +267,18 @@ private void store() { private byte[] serializeColors(Color[] colors) throws Exception { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bos); - out.writeObject(colors); - out.close(); + try (ObjectOutputStream out = new ObjectOutputStream(bos)) { + out.writeObject(colors); + } return bos.toByteArray(); } private Color[] deserializeColors(byte[] colors) throws Exception { ByteArrayInputStream bis = new ByteArrayInputStream(colors); - ObjectInputStream in = new ObjectInputStream(bis); - Color[] array = (Color[]) in.readObject(); - in.close(); + Color[] array; + try (ObjectInputStream in = new ObjectInputStream(bis)) { + array = (Color[]) in.readObject(); + } return array; } diff --git a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionElementColorTransformerUI.java b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionElementColorTransformerUI.java index 9bf69c3564..9a3171b6bb 100644 --- a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionElementColorTransformerUI.java +++ b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionElementColorTransformerUI.java @@ -70,7 +70,7 @@ public TransformerCategory getCategory() { @Override public String getDisplayName() { - return NbBundle.getMessage(UniqueElementColorTransformerUI.class, "Attribute.partition.name"); + return NbBundle.getMessage(PartitionElementColorTransformerUI.class, "Attribute.partition.name"); } @Override diff --git a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionLabelColorTransformerUI.java b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionLabelColorTransformerUI.java index 24c7579b4c..b869772620 100644 --- a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionLabelColorTransformerUI.java +++ b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionLabelColorTransformerUI.java @@ -70,7 +70,7 @@ public TransformerCategory getCategory() { @Override public String getDisplayName() { - return NbBundle.getMessage(UniqueElementColorTransformerUI.class, "Attribute.partition.name"); + return NbBundle.getMessage(PartitionLabelColorTransformerUI.class, "Attribute.partition.name"); } @Override diff --git a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelSizeTransformerUI.java b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelSizeTransformerUI.java index bf2c248bb4..d03201f890 100644 --- a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelSizeTransformerUI.java +++ b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RankingLabelSizeTransformerUI.java @@ -75,7 +75,7 @@ public Icon getIcon() { @Override public String getDisplayName() { - return NbBundle.getMessage(UniqueElementColorTransformerUI.class, "Attribute.ranking.name"); + return NbBundle.getMessage(RankingLabelSizeTransformerUI.class, "Attribute.ranking.name"); } @Override diff --git a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RecentPalettes.java b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RecentPalettes.java index 5938478cb1..3d73257f5a 100644 --- a/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RecentPalettes.java +++ b/modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RecentPalettes.java @@ -50,6 +50,7 @@ Development and Distribution License("CDDL") (collectively, the import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; import org.gephi.appearance.plugin.RankingElementColorTransformer.LinearGradient; +import org.openide.util.Exceptions; import org.openide.util.NbPreferences; /** @@ -104,7 +105,7 @@ private void store() { prefs.putByteArray(COLORS + i, serializeColors(gradient.getColors())); prefs.putByteArray(POSITIONS + i, serializePositions(gradient.getPositions())); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } i++; } @@ -124,7 +125,7 @@ private void retrieve() { LinearGradient linearGradient = new LinearGradient(colors, posisitons); gradients.addLast(linearGradient); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } else { break; @@ -150,33 +151,35 @@ protected final Preferences getPreferences() { private byte[] serializePositions(float[] positions) throws Exception { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bos); - out.writeObject(positions); - out.close(); + try (ObjectOutputStream out = new ObjectOutputStream(bos)) { + out.writeObject(positions); + } return bos.toByteArray(); } private float[] deserializePositions(byte[] positions) throws Exception { ByteArrayInputStream bis = new ByteArrayInputStream(positions); - ObjectInputStream in = new ObjectInputStream(bis); - float[] array = (float[]) in.readObject(); - in.close(); + float[] array; + try (ObjectInputStream in = new ObjectInputStream(bis)) { + array = (float[]) in.readObject(); + } return array; } private byte[] serializeColors(Color[] colors) throws Exception { ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bos); - out.writeObject(colors); - out.close(); + try (ObjectOutputStream out = new ObjectOutputStream(bos)) { + out.writeObject(colors); + } return bos.toByteArray(); } private Color[] deserializeColors(byte[] colors) throws Exception { ByteArrayInputStream bis = new ByteArrayInputStream(colors); - ObjectInputStream in = new ObjectInputStream(bis); - Color[] array = (Color[]) in.readObject(); - in.close(); + Color[] array; + try (ObjectInputStream in = new ObjectInputStream(bis)) { + array = (Color[]) in.readObject(); + } return array; } } diff --git a/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java b/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java index 34f20234d4..d906c198f2 100644 --- a/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java +++ b/modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java @@ -373,67 +373,4 @@ private boolean isSupportedPropertyType(Class type) { } return false; } - -// protected void setSelectedTransformerUI(TransformerUI transformerUI) { -// selectedTransformerUI.get(selectedElementClass).put(getSelectedCategory(), transformerUI); -// if (transformerUI instanceof SimpleTransformerUI) { -// if (selectedTransformer != null) { -// unsetupTransformer(selectedTransformer); -// } -// selectedTransformer = controller.appearanceController.getTransformer(transformerUI); -// setupTransformer(selectedTransformer); -// } else { -// //TODO -// } -// } -// public void setupTransformer(Transformer transformer) { -// for (Method m : transformer.getClass().getMethods()) { -// if (isSetter(m)) { -// Class paramClass = m.getParameterTypes()[0]; -// if (paramClass.isPrimitive() || Serializable.class.isAssignableFrom(paramClass)) { -// System.out.println("Setting to method " + m.getName()); -// } -// } -// } -// } -// -// public void unsetupTransformer(Transformer transformer) { -// for (Method m : transformer.getClass().getMethods()) { -// if (isGetter(m)) { -// Class returnClass = m.getReturnType(); -// if (returnClass.isPrimitive() || Serializable.class.isAssignableFrom(returnClass)) { -// try { -// Object res = m.invoke(transformer); -// if (res != null) { -// System.out.println("Extracted " + res + " from method " + m.getName()); -// } -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// } -// } -// } -// } -// -// public static boolean isGetter(Method method) { -// if (Modifier.isPublic(method.getModifiers()) -// && method.getParameterTypes().length == 0) { -// if (method.getName().matches("^get[A-Z].*") -// && !method.getReturnType().equals(void.class)) { -// return true; -// } -// if (method.getName().matches("^is[A-Z].*") -// && method.getReturnType().equals(boolean.class)) { -// return true; -// } -// } -// return false; -// } -// -// public static boolean isSetter(Method method) { -// return Modifier.isPublic(method.getModifiers()) -// && method.getReturnType().equals(void.class) -// && method.getParameterTypes().length == 1 -// && method.getName().matches("^set[A-Z].*"); -// } } diff --git a/modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/BannerComponent.java b/modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/BannerComponent.java index b480f14c5c..5d526fc8ea 100644 --- a/modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/BannerComponent.java +++ b/modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/BannerComponent.java @@ -50,6 +50,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.perspective.api.PerspectiveController; import org.gephi.perspective.spi.Perspective; import org.gephi.ui.utils.UIUtils; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.Lookup; @@ -60,7 +61,7 @@ Development and Distribution License("CDDL") (collectively, the public class BannerComponent extends javax.swing.JPanel { private transient JToggleButton[] buttons; - private transient PerspectiveController perspectiveController; + private final transient PerspectiveController perspectiveController; public BannerComponent() { initComponents(); @@ -81,7 +82,7 @@ public void actionPerformed(ActionEvent e) { java.net.URI uri = new java.net.URI("http://gephi.org"); desktop.browse(uri); } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } diff --git a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/CommandLineProcessor.java b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/CommandLineProcessor.java index aef919b846..90307c3236 100644 --- a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/CommandLineProcessor.java +++ b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/CommandLineProcessor.java @@ -58,6 +58,7 @@ Development and Distribution License("CDDL") (collectively, the import org.openide.NotifyDescriptor; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; @@ -69,8 +70,8 @@ Development and Distribution License("CDDL") (collectively, the @ServiceProvider(service = OptionProcessor.class) public class CommandLineProcessor extends OptionProcessor { - private Option openOption = Option.defaultArguments(); - private Option openOption2 = Option.additionalArguments('o', "open"); + private final Option openOption = Option.defaultArguments(); + private final Option openOption2 = Option.additionalArguments('o', "open"); private final String MEMORY_ERROR; private static final String GEPHI_EXTENSION = "gephi"; @@ -114,7 +115,7 @@ public void process(Env env, Map values) throws CommandException { try { pc.openProject(file); } catch (Exception ew) { - ew.printStackTrace(); + Exceptions.printStackTrace(ew); NotifyDescriptor.Message msg = new NotifyDescriptor.Message(NbBundle.getMessage(CommandLineProcessor.class, "CommandLineProcessor.openGephiError"), NotifyDescriptor.WARNING_MESSAGE); DialogDisplayer.getDefault().notify(msg); } @@ -134,7 +135,7 @@ public void process(Env env, Map values) throws CommandException { NotifyDescriptor nd = new NotifyDescriptor.Message(MEMORY_ERROR, NotifyDescriptor.ERROR_MESSAGE); DialogDisplayer.getDefault().notify(nd); } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); NotifyDescriptor nd = new NotifyDescriptor.Message("CommandLineParsing " + ex.getMessage(), NotifyDescriptor.ERROR_MESSAGE); DialogDisplayer.getDefault().notify(nd); } diff --git a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/DragNDropFrameAdapter.java b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/DragNDropFrameAdapter.java index a7f2fb4172..204260137d 100644 --- a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/DragNDropFrameAdapter.java +++ b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/DragNDropFrameAdapter.java @@ -100,7 +100,7 @@ public boolean importData(TransferHandler.TransferSupport support) { try { pc.openProject(file); } catch (Exception ew) { - ew.printStackTrace(); + Exceptions.printStackTrace(ew); NotifyDescriptor.Message msg = new NotifyDescriptor.Message(NbBundle.getMessage(DragNDropFrameAdapter.class, "DragNDropFrameAdapter.openGephiError"), NotifyDescriptor.WARNING_MESSAGE); DialogDisplayer.getDefault().notify(msg); } diff --git a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ReportController.java b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ReportController.java index 27a2ba2425..165efab831 100644 --- a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ReportController.java +++ b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ReportController.java @@ -69,6 +69,7 @@ Development and Distribution License("CDDL") (collectively, the import org.openide.NotifyDescriptor; import org.openide.modules.ModuleInfo; import org.openide.modules.SpecificationVersion; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.w3c.dom.Document; @@ -104,7 +105,7 @@ public void run() { NotifyDescriptor.INFORMATION_MESSAGE)); return; } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } handle.finish(); DialogDisplayer.getDefault().notify( @@ -163,7 +164,7 @@ private Document buildXMLDocument(Report report) { report.writeXml(document); return document; } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } return null; } diff --git a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ViewDataPanel.java b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ViewDataPanel.java index 5019391e2a..e1da6a815c 100644 --- a/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ViewDataPanel.java +++ b/modules/DesktopBranding/src/main/java/org/gephi/branding/desktop/reporter/ViewDataPanel.java @@ -47,6 +47,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.openide.util.Exceptions; import org.w3c.dom.Document; /** @@ -68,7 +69,7 @@ public ViewDataPanel(Document document) { String xmlString = result.getWriter().toString(); textArea.setText(xmlString); } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } diff --git a/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/QueryChildren.java b/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/QueryChildren.java index 1f5846920b..a7cb197dfa 100644 --- a/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/QueryChildren.java +++ b/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/QueryChildren.java @@ -54,6 +54,7 @@ Development and Distribution License("CDDL") (collectively, the import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.datatransfer.PasteType; @@ -132,10 +133,8 @@ public Transferable paste() throws IOException { return null; } }; - } catch (UnsupportedFlavorException ex) { - ex.printStackTrace(); - } catch (IOException ex) { - ex.printStackTrace(); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); } } return null; diff --git a/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/RootNode.java b/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/RootNode.java index 3ae5a8f82f..fba7fbf8db 100644 --- a/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/RootNode.java +++ b/modules/DesktopFilters/src/main/java/org/gephi/desktop/filters/query/RootNode.java @@ -55,6 +55,7 @@ Development and Distribution License("CDDL") (collectively, the import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.nodes.NodeTransfer; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.datatransfer.PasteType; @@ -88,10 +89,8 @@ public Transferable paste() throws IOException { return null; } }; - } catch (UnsupportedFlavorException ex) { - ex.printStackTrace(); - } catch (IOException ex) { - ex.printStackTrace(); + } catch (Exception ex) { + Exceptions.printStackTrace(ex); } } else if (dropNode != null && dropNode instanceof SavedQueryNode) { return new PasteType() { diff --git a/modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java b/modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java index efefe382ff..ba1cd6b64d 100644 --- a/modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java +++ b/modules/DesktopImport/src/main/java/org/gephi/desktop/importer/DesktopImportControllerUI.java @@ -115,13 +115,6 @@ public void fatalError(Throwable t) { if (t instanceof OutOfMemoryError) { return; } -// t.printStackTrace(); -// String message = t.getCause().getMessage(); -// if (message == null || message.isEmpty()) { -// message = t.getMessage(); -// } -// NotifyDescriptor.Message msg = new NotifyDescriptor.Message(message, NotifyDescriptor.WARNING_MESSAGE); -// DialogDisplayer.getDefault().notify(msg); Exceptions.printStackTrace(t); } }; diff --git a/modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java b/modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java index 6234c0ff7b..cc9576e7f0 100644 --- a/modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java +++ b/modules/DesktopProject/src/main/java/org/gephi/desktop/project/ProjectControllerUIImpl.java @@ -578,7 +578,7 @@ private void openFile(FileFilter[] fileFilters, FileFilter initialFilter) { try { loadProject(gephiFile); } catch (Exception ew) { - ew.printStackTrace(); + Exceptions.printStackTrace(ew); NotifyDescriptor.Message msg = new NotifyDescriptor.Message(NbBundle.getMessage(ProjectControllerUIImpl.class, "OpenProject.defaulterror"), NotifyDescriptor.WARNING_MESSAGE); DialogDisplayer.getDefault().notify(msg); } diff --git a/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryChooserUI.java b/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryChooserUI.java index 77cecb8ba0..74a1568722 100644 --- a/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryChooserUI.java +++ b/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryChooserUI.java @@ -92,6 +92,7 @@ import org.openide.awt.HtmlRenderer; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; +import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.NbBundle; @@ -1625,7 +1626,7 @@ public void run() { model.insertNodeInto(newFolderNode, selectedNode, selectedNode.getChildCount()); applyEdit(newFolderNode); } catch (IOException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } }); diff --git a/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryNode.java b/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryNode.java index 1aacb415f1..24aabe7c0d 100644 --- a/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryNode.java +++ b/modules/DirectoryChooser/src/main/java/org/netbeans/swing/dirchooser/DirectoryNode.java @@ -51,6 +51,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; +import org.openide.util.Exceptions; /** * A directory tree node. @@ -122,7 +123,7 @@ public boolean loadChildren(JFileChooser chooser, boolean descend) { ArrayList files = getFiles(chooser); - if (files.size() == 0) { + if (files.isEmpty()) { return false; } @@ -137,7 +138,7 @@ public boolean loadChildren(JFileChooser chooser, boolean descend) { } add(node); } catch (NullPointerException t) { - t.printStackTrace(); + Exceptions.printStackTrace(t); } } } diff --git a/modules/FiltersImpl/src/main/java/org/gephi/filters/FilterModelPersistenceProvider.java b/modules/FiltersImpl/src/main/java/org/gephi/filters/FilterModelPersistenceProvider.java index 66acbb944e..dfe77ee7e2 100644 --- a/modules/FiltersImpl/src/main/java/org/gephi/filters/FilterModelPersistenceProvider.java +++ b/modules/FiltersImpl/src/main/java/org/gephi/filters/FilterModelPersistenceProvider.java @@ -57,6 +57,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.project.api.Workspace; import org.gephi.project.spi.WorkspacePersistenceProvider; import org.gephi.project.spi.WorkspaceXMLPersistenceProvider; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.lookup.ServiceProvider; @@ -162,7 +163,7 @@ private void writeParameter(XMLStreamWriter writer, int index, FilterProperty pr writer.writeCharacters(editor.getAsText()); writer.writeEndElement(); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } @@ -316,7 +317,7 @@ private Query readQuery(XMLStreamReader reader, FilterModelImpl model) throws XM } } } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } else if (eventType.equals(XMLStreamReader.END_ELEMENT)) { property = null; diff --git a/modules/FiltersImpl/src/main/java/org/gephi/filters/GenericPropertyEditor.java b/modules/FiltersImpl/src/main/java/org/gephi/filters/GenericPropertyEditor.java index 7a2444284b..242617419e 100644 --- a/modules/FiltersImpl/src/main/java/org/gephi/filters/GenericPropertyEditor.java +++ b/modules/FiltersImpl/src/main/java/org/gephi/filters/GenericPropertyEditor.java @@ -48,6 +48,7 @@ Development and Distribution License("CDDL") (collectively, the import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.apache.commons.codec.binary.Base64; +import org.openide.util.Exceptions; public class GenericPropertyEditor extends PropertyEditorSupport { @@ -73,7 +74,7 @@ public String getAsText() { oos = new ObjectOutputStream(bos); oos.writeObject(val); } catch (Exception e) { - e.printStackTrace();; + Exceptions.printStackTrace(e); } finally { if (oos != null) { try { @@ -105,7 +106,7 @@ public void setAsText(String text) throws IllegalArgumentException { ois = new ObjectInputStream(bis); val = ois.readObject(); } catch (Exception e) { - e.printStackTrace();; + Exceptions.printStackTrace(e); } finally { if (ois != null) { try { diff --git a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/dynamic/DynamicRangeBuilder.java b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/dynamic/DynamicRangeBuilder.java index e66d3e9591..69847d25c0 100644 --- a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/dynamic/DynamicRangeBuilder.java +++ b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/dynamic/DynamicRangeBuilder.java @@ -63,6 +63,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.graph.api.types.IntervalSet; import org.gephi.graph.api.types.TimestampSet; import org.gephi.project.api.Workspace; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; @@ -220,7 +221,7 @@ public FilterProperty[] getProperties() { FilterProperty.createProperty(this, Range.class, "range"), FilterProperty.createProperty(this, Boolean.class, "keepNull")}; } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } return filterProperties; diff --git a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/EgoBuilder.java b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/EgoBuilder.java index 75a4a1aa4b..704eeec36a 100644 --- a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/EgoBuilder.java +++ b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/EgoBuilder.java @@ -56,6 +56,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.graph.api.Graph; import org.gephi.graph.api.Node; import org.gephi.project.api.Workspace; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; @@ -173,7 +174,7 @@ public FilterProperty[] getProperties() { FilterProperty.createProperty(this, Integer.class, "depth"), FilterProperty.createProperty(this, Boolean.class, "self")}; } catch (NoSuchMethodException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } return new FilterProperty[0]; } diff --git a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/NeighborsBuilder.java b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/NeighborsBuilder.java index 4fe47325f7..a2de01d9e5 100644 --- a/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/NeighborsBuilder.java +++ b/modules/FiltersPlugin/src/main/java/org/gephi/filters/plugin/graph/NeighborsBuilder.java @@ -57,6 +57,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.graph.api.GraphView; import org.gephi.graph.api.Node; import org.gephi.project.api.Workspace; +import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; @@ -177,7 +178,7 @@ public FilterProperty[] getProperties() { FilterProperty.createProperty(this, Integer.class, "depth"), FilterProperty.createProperty(this, Boolean.class, "self")}; } catch (NoSuchMethodException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } return new FilterProperty[0]; } diff --git a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualBooleanPanel.java b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualBooleanPanel.java index 5a95824afe..5eaf6caa14 100644 --- a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualBooleanPanel.java +++ b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualBooleanPanel.java @@ -45,6 +45,7 @@ Development and Distribution License("CDDL") (collectively, the import java.awt.event.ActionListener; import org.gephi.filters.plugin.attribute.AttributeEqualBuilder.EqualBooleanFilter; import org.gephi.filters.spi.FilterProperty; +import org.openide.util.Exceptions; /** * @@ -74,7 +75,7 @@ public void actionPerformed(ActionEvent evt) { try { match.setValue(trueButton.isSelected()); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } diff --git a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualNumberPanel.java b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualNumberPanel.java index 1f46e3fb28..715c055da7 100644 --- a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualNumberPanel.java +++ b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualNumberPanel.java @@ -48,6 +48,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.event.ChangeListener; import org.gephi.filters.plugin.attribute.AttributeEqualBuilder.EqualNumberFilter; import org.gephi.filters.spi.FilterProperty; +import org.openide.util.Exceptions; import org.openide.util.WeakListeners; /** @@ -68,7 +69,7 @@ public void stateChanged(ChangeEvent evt) { try { match.setValue((Number) valueSpinner.getValue()); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } diff --git a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualStringPanel.java b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualStringPanel.java index 62e4b7167f..0f59a462c8 100644 --- a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualStringPanel.java +++ b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/attribute/EqualStringPanel.java @@ -52,6 +52,7 @@ Development and Distribution License("CDDL") (collectively, the import org.netbeans.validation.api.Validator; import org.netbeans.validation.api.ui.ValidationGroup; import org.netbeans.validation.api.ui.ValidationPanel; +import org.openide.util.Exceptions; /** * @@ -79,7 +80,7 @@ public void actionPerformed(ActionEvent evt) { useRegex.setValue(regexCheckbox.isSelected()); } } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } @@ -92,7 +93,7 @@ public void setup(AttributeEqualBuilder.EqualStringFilter filter) { textField.setText((String) pattern.getValue()); regexCheckbox.setSelected((Boolean) useRegex.getValue()); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } @@ -170,7 +171,7 @@ private void initComponents() { private static class RegexValidator implements Validator { - private EqualStringPanel panel; + private final EqualStringPanel panel; public RegexValidator(EqualStringPanel panel) { this.panel = panel; diff --git a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/graph/KCorePanel.java b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/graph/KCorePanel.java index d8606090e3..9e9a63cec9 100644 --- a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/graph/KCorePanel.java +++ b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/graph/KCorePanel.java @@ -45,6 +45,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.event.ChangeListener; import org.gephi.filters.plugin.graph.KCoreBuilder.KCoreFilter; import org.gephi.filters.spi.FilterProperty; +import org.openide.util.Exceptions; import org.openide.util.WeakListeners; /** @@ -65,7 +66,7 @@ public void stateChanged(ChangeEvent evt) { try { k.setValue((Integer) degreeSpinner.getValue()); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } diff --git a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/partition/PartitionPanel.java b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/partition/PartitionPanel.java index 4121a937f0..c1b9bca33a 100644 --- a/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/partition/PartitionPanel.java +++ b/modules/FiltersPluginUI/src/main/java/org/gephi/ui/filters/plugin/partition/PartitionPanel.java @@ -68,6 +68,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.plaf.basic.BasicListUI; import org.gephi.appearance.api.Partition; import org.gephi.filters.plugin.partition.PartitionBuilder.PartitionFilter; +import org.openide.util.Exceptions; import org.openide.util.NbBundle; /** @@ -255,16 +256,8 @@ public static void computeListSize(final JList list) { method.invoke(ui); list.revalidate(); list.repaint(); - } catch (final SecurityException e) { - e.printStackTrace(); - } catch (final NoSuchMethodException e) { - e.printStackTrace(); - } catch (final IllegalArgumentException e) { - e.printStackTrace(); - } catch (final IllegalAccessException e) { - e.printStackTrace(); - } catch (final InvocationTargetException e) { - e.printStackTrace(); + } catch (Exception e) { + Exceptions.printStackTrace(e); } } } diff --git a/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterPajek.java b/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterPajek.java index 4a9807138b..012a60c39c 100644 --- a/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterPajek.java +++ b/modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterPajek.java @@ -157,7 +157,6 @@ private void importData(LineNumberReader reader) throws Exception { reader.close(); } catch (Exception e) { - e.printStackTrace(); throw new RuntimeException(e); } Progress.finish(progressTicket); diff --git a/modules/ImportPluginUI/src/main/java/org/gephi/ui/importer/plugin/EdgeListDatabaseManager.java b/modules/ImportPluginUI/src/main/java/org/gephi/ui/importer/plugin/EdgeListDatabaseManager.java index 1a8fc67f1b..abc1140aed 100644 --- a/modules/ImportPluginUI/src/main/java/org/gephi/ui/importer/plugin/EdgeListDatabaseManager.java +++ b/modules/ImportPluginUI/src/main/java/org/gephi/ui/importer/plugin/EdgeListDatabaseManager.java @@ -53,6 +53,7 @@ Development and Distribution License("CDDL") (collectively, the import org.openide.filesystems.FileLock; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; +import org.openide.util.Exceptions; /** * @@ -108,15 +109,8 @@ private void load() { if (unserialized != null) { edgeListDatabases = unserialized; } - } catch (java.io.InvalidClassException e) { - } catch (EOFException eofe) { - // Empty configuration: do nothing - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ClassNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + } catch (Exception e) { + Exceptions.printStackTrace(e); } finally { if (is != null) { try { @@ -143,8 +137,7 @@ private void doPersist() { ois = new ObjectOutputStream(databaseConfigurations.getOutputStream(lock)); ois.writeObject(edgeListDatabases); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Exceptions.printStackTrace(e); } finally { if (ois != null) { try { diff --git a/modules/LayoutAPI/src/main/java/org/gephi/layout/LayoutModelImpl.java b/modules/LayoutAPI/src/main/java/org/gephi/layout/LayoutModelImpl.java index 163adce32f..b45dade80e 100644 --- a/modules/LayoutAPI/src/main/java/org/gephi/layout/LayoutModelImpl.java +++ b/modules/LayoutAPI/src/main/java/org/gephi/layout/LayoutModelImpl.java @@ -195,7 +195,7 @@ public void saveProperties(Layout layout) { savedProperties.put(new LayoutPropertyKey(p.getCanonicalName(), layout.getClass().getName()), value); } } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } } @@ -214,7 +214,7 @@ public void loadProperties(Layout layout) { try { property.getProperty().setValue(savedProperties.get(l)); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } } diff --git a/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/AutoLayout.java b/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/AutoLayout.java index f77be7a33d..53e77f55c6 100644 --- a/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/AutoLayout.java +++ b/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/AutoLayout.java @@ -144,7 +144,7 @@ private void setProperties() { d.getProperty().setValue(val); } } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } } diff --git a/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/openord/Combine.java b/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/openord/Combine.java index 482fb6dcad..19b54e8aa6 100644 --- a/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/openord/Combine.java +++ b/modules/LayoutPlugin/src/main/java/org/gephi/layout/plugin/openord/Combine.java @@ -44,6 +44,7 @@ Development and Distribution License("CDDL") (collectively, the import java.text.DecimalFormat; import java.text.NumberFormat; import org.gephi.graph.api.Graph; +import org.openide.util.Exceptions; /** * @@ -171,7 +172,7 @@ public void waitForIteration() { lock.wait(); } } catch (InterruptedException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } } diff --git a/modules/StatisticsAPI/src/main/java/org/gephi/statistics/StatisticsModelImpl.java b/modules/StatisticsAPI/src/main/java/org/gephi/statistics/StatisticsModelImpl.java index 8ba483fd25..2f2dcb4679 100644 --- a/modules/StatisticsAPI/src/main/java/org/gephi/statistics/StatisticsModelImpl.java +++ b/modules/StatisticsAPI/src/main/java/org/gephi/statistics/StatisticsModelImpl.java @@ -62,6 +62,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.statistics.spi.StatisticsUI; import org.gephi.utils.TempDirUtils; import org.gephi.utils.TempDirUtils.TempDir; +import org.openide.util.Exceptions; import org.openide.util.Lookup; /** @@ -167,7 +168,7 @@ private String unembedImages(String report) { } } } catch (IOException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } return builder.toString(); } @@ -189,7 +190,7 @@ private String embedImages(String report) { BufferedImage image = ImageIO.read(file); ImageIO.write((RenderedImage) image, "PNG", out); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } byte[] imageBytes = out.toByteArray(); String base64String = Base64.encodeBase64String(imageBytes); diff --git a/modules/StatisticsPluginUI/src/main/java/org/gephi/ui/statistics/plugin/EigenvectorCentralityPanel.java b/modules/StatisticsPluginUI/src/main/java/org/gephi/ui/statistics/plugin/EigenvectorCentralityPanel.java index 62f36011e9..083c031a23 100644 --- a/modules/StatisticsPluginUI/src/main/java/org/gephi/ui/statistics/plugin/EigenvectorCentralityPanel.java +++ b/modules/StatisticsPluginUI/src/main/java/org/gephi/ui/statistics/plugin/EigenvectorCentralityPanel.java @@ -42,6 +42,7 @@ Development and Distribution License("CDDL") (collectively, the package org.gephi.ui.statistics.plugin; import org.gephi.graph.api.GraphController; +import org.openide.util.Exceptions; import org.openide.util.Lookup; /** @@ -81,7 +82,9 @@ public int getNumRuns(){ try{ int runs = Integer.parseInt(iterationTextField.getText()); return runs; - }catch(Exception e){e.printStackTrace();} + }catch(Exception e){ + Exceptions.printStackTrace(e); + } return 0; } diff --git a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditWindowControllerImpl.java b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditWindowControllerImpl.java index 1f9c202556..aa693e4ff9 100644 --- a/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditWindowControllerImpl.java +++ b/modules/ToolsPlugin/src/main/java/org/gephi/ui/tools/plugin/edit/EditWindowControllerImpl.java @@ -45,6 +45,7 @@ Development and Distribution License("CDDL") (collectively, the import org.gephi.graph.api.Edge; import org.gephi.graph.api.Node; import org.gephi.tools.api.EditWindowController; +import org.openide.util.Exceptions; import org.openide.util.lookup.ServiceProvider; import org.openide.windows.WindowManager; @@ -115,7 +116,7 @@ public boolean isOpen() { try { SwingUtilities.invokeAndWait(runnable); } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } return runnable.open; diff --git a/modules/UIComponents/src/main/java/org/gephi/ui/components/SimpleHTMLReport.java b/modules/UIComponents/src/main/java/org/gephi/ui/components/SimpleHTMLReport.java index 48bde99855..3db061a8cd 100644 --- a/modules/UIComponents/src/main/java/org/gephi/ui/components/SimpleHTMLReport.java +++ b/modules/UIComponents/src/main/java/org/gephi/ui/components/SimpleHTMLReport.java @@ -73,6 +73,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.text.View; import org.apache.commons.codec.binary.Base64; import org.openide.awt.StatusDisplayer; +import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.util.NbPreferences; import org.openide.windows.WindowManager; @@ -90,7 +91,7 @@ class ReportSelection implements Transferable { try { flavors.add(new DataFlavor("text/html;class=java.lang.String")); } catch (ClassNotFoundException ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); } } private String html; @@ -115,7 +116,7 @@ public ReportSelection(String html) { BufferedImage image = ImageIO.read(file); ImageIO.write((RenderedImage) image, "PNG", out); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } byte[] imageBytes = out.toByteArray(); String base64String = Base64.encodeBase64String(imageBytes); @@ -271,7 +272,7 @@ private void printButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F pjob.print(); } } catch (PrinterException e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } }//GEN-LAST:event_printButtonActionPerformed private final String LAST_PATH = "SimpleHTMLReport_Save_Last_Path"; @@ -297,7 +298,7 @@ public void run() { StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage(SimpleHTMLReport.class, "SimpleHTMLReport.status.saveError", destinationFolder.getName())); } } catch (IOException e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } } }, "SaveReportTask"); @@ -353,7 +354,7 @@ private void copyButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI try { toolkit.getSystemClipboard().setContents(new ReportSelection(this.mHTMLReport), null); } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } }//GEN-LAST:event_copyButtonActionPerformed @@ -408,7 +409,7 @@ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) { return Printable.NO_SUCH_PAGE; } } catch (Exception e) { - e.printStackTrace(); + Exceptions.printStackTrace(e); } return Printable.PAGE_EXISTS; } diff --git a/modules/UIComponents/src/main/java/org/gephi/ui/components/gradientslider/MultiThumbSlider.java b/modules/UIComponents/src/main/java/org/gephi/ui/components/gradientslider/MultiThumbSlider.java index f22ac77402..1f022de17a 100644 --- a/modules/UIComponents/src/main/java/org/gephi/ui/components/gradientslider/MultiThumbSlider.java +++ b/modules/UIComponents/src/main/java/org/gephi/ui/components/gradientslider/MultiThumbSlider.java @@ -47,6 +47,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.openide.util.Exceptions; /** This JComponent resembles a JSlider, except there are * at least two thumbs. A JSlider is designed to modify @@ -188,7 +189,7 @@ protected void fireChangeListeners() { try { ((ChangeListener) changeListeners.get(a)).stateChanged(new ChangeEvent(this)); } catch (Throwable t) { - t.printStackTrace(); + Exceptions.printStackTrace(t); } } } diff --git a/modules/UIUtils/src/main/java/org/gephi/ui/utils/UIUtils.java b/modules/UIUtils/src/main/java/org/gephi/ui/utils/UIUtils.java index 653552957d..0427196874 100644 --- a/modules/UIUtils/src/main/java/org/gephi/ui/utils/UIUtils.java +++ b/modules/UIUtils/src/main/java/org/gephi/ui/utils/UIUtils.java @@ -63,6 +63,7 @@ Development and Distribution License("CDDL") (collectively, the import javax.swing.UIManager; import javax.swing.plaf.basic.BasicButtonListener; import javax.swing.table.JTableHeader; +import org.openide.util.Exceptions; //Copied from org.netbeans.lib.profiler.ui public final class UIUtils { @@ -543,10 +544,8 @@ public static void runInEventDispatchThreadAndWait(final Runnable r) { } else { try { SwingUtilities.invokeAndWait(r); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InvocationTargetException | InterruptedException e) { + Exceptions.printStackTrace(e); } } } diff --git a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/opengl/GraphicalConfiguration.java b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/opengl/GraphicalConfiguration.java index bb333b3248..02d3b7df8e 100644 --- a/modules/VisualizationImpl/src/main/java/org/gephi/visualization/opengl/GraphicalConfiguration.java +++ b/modules/VisualizationImpl/src/main/java/org/gephi/visualization/opengl/GraphicalConfiguration.java @@ -48,6 +48,7 @@ Development and Distribution License("CDDL") (collectively, the import com.jogamp.opengl.GLProfile; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; +import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.windows.WindowManager; @@ -98,13 +99,13 @@ public void checkGeneralCompatibility(GL2 gl) { //Pbuffer pBufferSupport = GLDrawableFactory.getDesktopFactory().canCreateGLPbuffer(device, profile); - } catch (final GraphicalConfigurationException exc) { + } catch (final GraphicalConfigurationException e) { messageDelivered = true; SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), exc.getMessage(), "Configuration", JOptionPane.WARNING_MESSAGE); - exc.printStackTrace(); + JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), e.getMessage(), "Configuration", JOptionPane.WARNING_MESSAGE); + Exceptions.printStackTrace(e); } }); } diff --git a/modules/WelcomeScreen/src/main/java/org/gephi/desktop/welcome/WelcomeTopComponent.java b/modules/WelcomeScreen/src/main/java/org/gephi/desktop/welcome/WelcomeTopComponent.java index 7f3314ba4f..e493cccf5d 100644 --- a/modules/WelcomeScreen/src/main/java/org/gephi/desktop/welcome/WelcomeTopComponent.java +++ b/modules/WelcomeScreen/src/main/java/org/gephi/desktop/welcome/WelcomeTopComponent.java @@ -121,7 +121,7 @@ public void actionPerformed(ActionEvent e) { try { pc.openProject(file); } catch (Exception ex) { - ex.printStackTrace(); + Exceptions.printStackTrace(ex); NotifyDescriptor.Message msg = new NotifyDescriptor.Message(NbBundle.getMessage(WelcomeTopComponent.class, "WelcomeTopComponent.openGephiError"), NotifyDescriptor.WARNING_MESSAGE); DialogDisplayer.getDefault().notify(msg); }