diff options
Diffstat (limited to 'netx/net/sourceforge/jnlp/controlpanel')
7 files changed, 119 insertions, 95 deletions
diff --git a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java index da3c92e..502cf8a 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java +++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java @@ -54,6 +54,7 @@ import net.sourceforge.jnlp.cache.DirectoryNode; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.util.FileUtils; +import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.PropertiesFile; public class CachePane extends JPanel { @@ -164,7 +165,7 @@ public class CachePane extends JPanel { FileUtils.createParentDir(netxRunningFile); FileUtils.createRestrictedFile(netxRunningFile, true); } catch (IOException e1) { - e1.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1); } } @@ -197,7 +198,7 @@ public class CachePane extends JPanel { fl.release(); fl.channel().close(); } catch (IOException e1) { - e1.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1); } } } diff --git a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java index 01093ee..958221c 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java +++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java @@ -31,6 +31,8 @@ import javax.naming.ConfigurationException; import net.sourceforge.jnlp.config.ConfiguratonValidator; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.config.Setting; +import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.logging.OutputController; /** * Encapsulates a command line interface to the deployment configuration. @@ -80,7 +82,8 @@ public class CommandLine { try { config.load(false); } catch (ConfigurationException e) { - System.out.println(R("RConfigurationFatal")); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("RConfigurationFatal")); + OutputController.getLogger().log(e); } } @@ -91,10 +94,10 @@ public class CommandLine { * @return the result of handling the help command. SUCCESS if no errors occurred. */ public int handleHelpCommand(List<String> args) { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " " + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " " + allCommands.toString().replace(',', '|').replaceAll(" ", "") + " [help]"); - System.out.println(R("CLHelpDescription", PROGRAM_NAME)); + OutputController.getLogger().printOutLn(R("CLHelpDescription", PROGRAM_NAME)); return SUCCESS; } @@ -102,9 +105,9 @@ public class CommandLine { * Prints help message for the list command */ public void printListHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " list [--details]"); - System.out.println(R("CLListDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " list [--details]"); + OutputController.getLogger().printOutLn(R("CLListDescription")); } /** @@ -134,9 +137,9 @@ public class CommandLine { Map<String, Setting<String>> all = config.getRaw(); for (String key : all.keySet()) { Setting<String> value = all.get(key); - System.out.println(key + ": " + value.getValue()); + OutputController.getLogger().printOutLn(key + ": " + value.getValue()); if (verbose) { - System.out.println("\t" + R("CLDescription", value.getDescription())); + OutputController.getLogger().printOutLn("\t" + R("CLDescription", value.getDescription())); } } return SUCCESS; @@ -146,9 +149,9 @@ public class CommandLine { * Prints help message for the get command */ public void printGetHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " get property-name"); - System.out.println(R("CLGetDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " get property-name"); + OutputController.getLogger().printOutLn(R("CLGetDescription")); } /** @@ -175,10 +178,10 @@ public class CommandLine { String value = null; if (all.containsKey(key)) { value = all.get(key).getValue(); - System.out.println(value); + OutputController.getLogger().printOutLn(value); return SUCCESS; } else { - System.out.println(R("CLUnknownProperty", key)); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key)); return ERROR; } } @@ -187,9 +190,9 @@ public class CommandLine { * Prints the help message for the 'set' command */ public void printSetHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " set property-name value"); - System.out.println(R("CLSetDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " set property-name value"); + OutputController.getLogger().printOutLn(R("CLSetDescription")); } /** @@ -219,20 +222,21 @@ public class CommandLine { try { old.getValidator().validate(value); } catch (IllegalArgumentException e) { - System.out.println(R("CLIncorrectValue", old.getName(), value, old.getValidator().getPossibleValues())); + OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("CLIncorrectValue", old.getName(), value, old.getValidator().getPossibleValues())); + OutputController.getLogger().log(e); return ERROR; } } config.setProperty(key, value); } else { - System.out.println(R("CLWarningUnknownProperty", key)); + OutputController.getLogger().printOutLn(R("CLWarningUnknownProperty", key)); config.setProperty(key, value); } try { config.save(); } catch (IOException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); return ERROR; } @@ -243,9 +247,9 @@ public class CommandLine { * Prints a help message for the reset command */ public void printResetHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " reset [all|property-name]"); - System.out.println(R("CLResetDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " reset [all|property-name]"); + OutputController.getLogger().printOutLn(R("CLResetDescription")); } /** @@ -275,7 +279,7 @@ public class CommandLine { Map<String, Setting<String>> all = config.getRaw(); if (!resetAll && !all.containsKey(key)) { - System.out.println(R("CLUnknownProperty", key)); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", key)); return ERROR; } @@ -292,7 +296,7 @@ public class CommandLine { try { config.save(); } catch (IOException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); return ERROR; } @@ -303,9 +307,9 @@ public class CommandLine { * Print a help message for the 'info' command */ public void printInfoHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " info property-name"); - System.out.println(R("CLInfoDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " info property-name"); + OutputController.getLogger().printOutLn(R("CLInfoDescription")); } /** @@ -331,15 +335,15 @@ public class CommandLine { String key = args.get(0); Setting<String> value = all.get(key); if (value == null) { - System.out.println(R("CLNoInfo")); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLNoInfo")); return ERROR; } else { - System.out.println(R("CLDescription", value.getDescription())); - System.out.println(R("CLValue", value.getValue())); + OutputController.getLogger().printOutLn(R("CLDescription", value.getDescription())); + OutputController.getLogger().printOutLn(R("CLValue", value.getValue())); if (value.getValidator() != null) { - System.out.println("\t" + R("VVPossibleValues", value.getValidator().getPossibleValues())); + OutputController.getLogger().printOutLn("\t" + R("VVPossibleValues", value.getValidator().getPossibleValues())); } - System.out.println(R("CLValueSource", value.getSource())); + OutputController.getLogger().printOutLn(R("CLValueSource", value.getSource())); return SUCCESS; } } @@ -348,9 +352,9 @@ public class CommandLine { * Prints a help message for the 'check' command */ public void printCheckHelp() { - System.out.println(R("Usage")); - System.out.println(" " + PROGRAM_NAME + " check"); - System.out.println(R("CLCheckDescription")); + OutputController.getLogger().printOutLn(R("Usage")); + OutputController.getLogger().printOutLn(" " + PROGRAM_NAME + " check"); + OutputController.getLogger().printOutLn(R("CLCheckDescription")); } /** @@ -378,17 +382,17 @@ public class CommandLine { boolean allValid = true; for (Setting<String> setting : validator.getIncorrectSetting()) { - System.out.println(R("CLIncorrectValue", setting.getName(), setting.getValue(), setting.getValidator().getPossibleValues())); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLIncorrectValue", setting.getName(), setting.getValue(), setting.getValidator().getPossibleValues())); allValid = false; } for (Setting<String> setting : validator.getUnrecognizedSetting()) { - System.out.println(R("CLUnknownProperty", setting.getName())); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownProperty", setting.getName())); allValid = false; } if (allValid) { - System.out.println(R("CLNoIssuesFound")); + OutputController.getLogger().printOutLn(R("CLNoIssuesFound")); return SUCCESS; } else { return ERROR; @@ -437,10 +441,10 @@ public class CommandLine { } else if (command.equals("check")) { val = handleCheckCommand(arguments); } else if (allCommands.contains(command)) { - System.out.println("INTERNAL ERROR: " + command + " should have been implemented"); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "INTERNAL ERROR: " + command + " should have been implemented"); val = ERROR; } else { - System.out.println(R("CLUnknownCommand", command)); + OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CLUnknownCommand", command)); handleHelpCommand(new ArrayList<String>()); val = ERROR; } @@ -460,10 +464,10 @@ public class CommandLine { CommandLine cli = new CommandLine(); int result = cli.handle(args); - // instead of returning, use System.exit() so we can pass back + // instead of returning, use JNLPRuntime.exit() so we can pass back // error codes indicating success or failure. Otherwise using // this program for scripting will become much more challenging - System.exit(result); + JNLPRuntime.exit(result); } } } diff --git a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java index d118301..e3fa2db 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java @@ -58,6 +58,7 @@ import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.security.KeyStores; import net.sourceforge.jnlp.security.viewer.CertificatePane; import net.sourceforge.jnlp.util.ImageResources; +import net.sourceforge.jnlp.util.logging.OutputController; /** * This is the control panel for Java. It provides a GUI for modifying the @@ -149,7 +150,7 @@ public class ControlPanel extends JFrame { URL imgUrl = cl.getResource("net/sourceforge/jnlp/resources/netx-icon.png"); image.setIcon(new ImageIcon(ImageIO.read(imgUrl))); } catch (IOException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); } JPanel topPanel = new JPanel(new BorderLayout()); @@ -381,7 +382,7 @@ public class ControlPanel extends JFrame { JLabel label = new JLabel("Not Implemented", icon, SwingConstants.CENTER); notImplementedPanel.add(label); } catch (IOException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); } return notImplementedPanel; } @@ -393,7 +394,7 @@ public class ControlPanel extends JFrame { try { config.save(); } catch (IOException e) { - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); JOptionPane.showMessageDialog(this, e); } } @@ -410,7 +411,7 @@ public class ControlPanel extends JFrame { // if configuration is not loaded, we will get NullPointerExceptions // everywhere - e.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); } try { diff --git a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java index d84ea04..003f486 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java @@ -25,15 +25,14 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; - import javax.swing.Box; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; - import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.util.logging.LogConfig; /** * This displays the options related to debugging. @@ -43,12 +42,17 @@ import net.sourceforge.jnlp.runtime.Translator; */ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { - /** List of properties used by this panel */ - public static String[] properties = { "deployment.trace", // Debugging - "deployment.log", // Debugging - "deployment.console.startup.mode", // Java Console + /** List of properties used by checkboxes in this panel */ + public static String[] properties = { + DeploymentConfiguration.KEY_ENABLE_LOGGING, + DeploymentConfiguration.KEY_ENABLE_LOGGING_HEADERS, + DeploymentConfiguration.KEY_ENABLE_LOGGING_TOFILE, + DeploymentConfiguration.KEY_ENABLE_LOGGING_TOSTREAMS, + DeploymentConfiguration.KEY_ENABLE_LOGGING_TOSYSTEMLOG + }; - private DeploymentConfiguration config; + + private DeploymentConfiguration config; /** * Create a new instance of the debugging panel. @@ -72,8 +76,20 @@ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { JLabel debuggingDescription = new JLabel("<html>" + Translator.R("CPDebuggingDescription") + "<hr /><br /></html>"); - JCheckBox[] debuggingOptions = { new JCheckBox(Translator.R("DPEnableTracing")), - new JCheckBox(Translator.R("DPEnableLogging")), }; + JCheckBox[] debuggingOptions = { + new JCheckBox(Translator.R("DPEnableLogging")), + new JCheckBox(Translator.R("DPEnableHeaders")), + new JCheckBox(Translator.R("DPEnableFile")), + new JCheckBox(Translator.R("DPEnableStds")), + new JCheckBox(Translator.R("DPEnableSyslog")) + }; + String[] hints = { + (Translator.R("DPEnableLoggingHint")), + (Translator.R("DPEnableHeadersHint")), + (Translator.R("DPEnableFileHint", LogConfig.getLogConfig().getIcedteaLogDir())), + (Translator.R("DPEnableStdsHint")), + (Translator.R("DPEnableSyslogHint")) + }; ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"), new ComboItem(Translator.R("DPHide"), "HIDE"), @@ -81,7 +97,7 @@ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { JLabel consoleLabel = new JLabel(Translator.R("DPJavaConsole")); JComboBox consoleComboBox = new JComboBox(); - consoleComboBox.setActionCommand("deployment.console.startup.mode"); // The property this comboBox affects. + consoleComboBox.setActionCommand(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE); // The property this comboBox affects. JPanel consolePanel = new JPanel(); consolePanel.setLayout(new FlowLayout(FlowLayout.LEADING)); @@ -98,33 +114,33 @@ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { * Add the items to the panel unless we can not get the values for them. */ for (int i = 0; i < properties.length; i++) { - try { - String s = config.getProperty(properties[i]); - c.gridy = i + 1; - - switch (i) { - case 0: - case 1: - debuggingOptions[i].setSelected(Boolean.parseBoolean(s)); - debuggingOptions[i].setActionCommand(properties[i]); - debuggingOptions[i].addItemListener(this); - add(debuggingOptions[i], c); - break; - case 2: - for (int j = 0; j < javaConsoleItems.length; j++) { - consoleComboBox.addItem(javaConsoleItems[j]); - if (config.getProperty("deployment.console.startup.mode").equals(javaConsoleItems[j].getValue())) - consoleComboBox.setSelectedIndex(j); - } - consoleComboBox.addItemListener(this); - add(consolePanel, c); - } - - } catch (Exception e) { - debuggingOptions[i] = null; + String s = config.getProperty(properties[i]); + c.gridy++; + if (i == 2) { + JLabel space = new JLabel("<html>" + Translator.R("CPDebuggingPossibilites") + ":</html>"); + add(space, c); + c.gridy++; } + + debuggingOptions[i].setSelected(Boolean.parseBoolean(s)); + debuggingOptions[i].setActionCommand(properties[i]); + debuggingOptions[i].setToolTipText(hints[i]); + debuggingOptions[i].addItemListener(this); + add(debuggingOptions[i], c); + + } + for (int j = 0; j < javaConsoleItems.length; j++) { + consoleComboBox.addItem(javaConsoleItems[j]); + if (config.getProperty(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE).equals(javaConsoleItems[j].getValue())) { + consoleComboBox.setSelectedIndex(j); + } + } + c.gridy++; + consoleComboBox.addItemListener(this); + add(consolePanel, c); + // pack the bottom so that it doesn't change size if resized. Component filler = Box.createRigidArea(new Dimension(1, 1)); c.gridy++; diff --git a/netx/net/sourceforge/jnlp/controlpanel/DocumentAdapter.java b/netx/net/sourceforge/jnlp/controlpanel/DocumentAdapter.java index 2bcb0c2..7d6cd7c 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/DocumentAdapter.java +++ b/netx/net/sourceforge/jnlp/controlpanel/DocumentAdapter.java @@ -23,6 +23,7 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; import net.sourceforge.jnlp.config.DeploymentConfiguration; +import net.sourceforge.jnlp.util.logging.OutputController; /** * Updates the property as it happens. @@ -94,8 +95,7 @@ public class DocumentAdapter implements DocumentListener { config.setProperty(property, value); } } catch (BadLocationException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e1); } } diff --git a/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java b/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java index 9f1dd52..9118973 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java @@ -55,6 +55,7 @@ import javax.swing.event.DocumentListener; import javax.swing.text.Document; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.StreamUtils; @SuppressWarnings("serial") @@ -254,12 +255,12 @@ public class JVMPanel extends NamedBorderPanel { processErrorStream = StreamUtils.readStreamAsString(p.getErrorStream()); processStdOutStream = StreamUtils.readStreamAsString(p.getInputStream()); r = p.exitValue(); - System.err.println(processErrorStream); - System.out.println(processStdOutStream); + OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, processErrorStream); + OutputController.getLogger().log(processStdOutStream); processErrorStream = processErrorStream.toLowerCase(); processStdOutStream = processStdOutStream.toLowerCase(); } catch (Exception ex) {; - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); } if (r == null) { diff --git a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java index 60a27ee..1cb38af 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java @@ -81,6 +81,7 @@ import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecuri import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionEntry; import net.sourceforge.jnlp.security.appletextendedsecurity.UrlRegEx; import net.sourceforge.jnlp.security.appletextendedsecurity.impl.UnsignedAppletActionStorageExtendedImpl; +import net.sourceforge.jnlp.util.logging.OutputController; import net.sourceforge.jnlp.util.ScreenFinder; public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { @@ -143,7 +144,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { f.add(new UnsignedAppletsTrustingListPanel(ff2, ff1, cc)); f.setVisible(true); } catch (Exception ex) { - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); } } }); @@ -511,7 +512,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { conf.setProperty(DeploymentConfiguration.KEY_SECURITY_LEVEL, ((AppletSecurityLevel) mainPolicyComboBox.getSelectedItem()).toChars()); conf.save(); } catch (Exception ex) { - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); JOptionPane.showMessageDialog(this, ex); } } @@ -552,7 +553,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { JOptionPane.showMessageDialog(this, Translator.R("APPEXTSECguiPanelMatchingNote") + "\n" + appletItemsToCaption(i, Translator.R("APPEXTSECguiPanelMatched") + ": ")); } } catch (Exception ex) { - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); JOptionPane.showMessageDialog(this, Translator.R("APPEXTSECguiPanelMatchingError", ex)); } @@ -569,7 +570,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { try { f = File.createTempFile("appletTable", "validation"); } catch (Exception ex) { - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); JOptionPane.showMessageDialog(this, Translator.R("APPEXTSECguiPanelCanNOtValidate", ex.toString())); return; } @@ -600,7 +601,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { } JOptionPane.showMessageDialog(this, Translator.R("APPEXTSECguiPanelTableValid")); } catch (Exception ex) { - ex.printStackTrace(); + OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex); JOptionPane.showMessageDialog(this, Translator.R("APPEXTSECguiPanelTableInvalid ", ex.toString())); } finally { f.delete(); @@ -645,7 +646,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { break; } } - //System.out.println(+orig+" "+i+" "+nwx+" "+nw+" "); + //ItwLogger.getLogger().log(OutputController.Level.ERROR_ALL, orig+" "+i+" "+nwx+" "+nw+" "); if (nw != orig) { if (orig >= 1) { currentTable.getSelectionModel().setSelectionInterval(orig - 1, orig - 1); @@ -673,7 +674,7 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { break; } } - // System.out.println(+orig+" "+i+" "+nwx+" "+nw+" "); + // OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, orig+" "+i+" "+nwx+" "+nw+" "); if (nw != orig) { if (orig < currentModel.getRowCount()) { currentTable.getSelectionModel().setSelectionInterval(orig + 1, orig + 1); |