From: <cpm...@us...> - 2011-03-16 18:12:51
|
Revision: 14723 http://pcgen.svn.sourceforge.net/pcgen/?rev=14723&view=rev Author: cpmeister Date: 2011-03-16 18:12:44 +0000 (Wed, 16 Mar 2011) Log Message: ----------- UI Update -fixed bug that caused loading errors to not display on the status bar Modified Paths: -------------- sandbox/uisync/code/src/java/pcgen/gui2/PCGenFrame.java sandbox/uisync/code/src/java/pcgen/gui2/PCGenStatusBar.java sandbox/uisync/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java sandbox/uisync/code/src/java/pcgen/system/PCGenTask.java sandbox/uisync/code/src/java/pcgen/system/PCGenTaskEvent.java sandbox/uisync/code/src/java/pcgen/system/PCGenTaskExecutor.java Modified: sandbox/uisync/code/src/java/pcgen/gui2/PCGenFrame.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui2/PCGenFrame.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/gui2/PCGenFrame.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -48,6 +48,7 @@ import java.util.List; import java.util.Map; +import java.util.logging.LogRecord; import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.InputMap; @@ -853,7 +854,7 @@ private final SourceSelectionFacade sources; private final SourceFileLoader loader; - private final SwingWorker<List<String>> worker; + private final SwingWorker<List<LogRecord>> worker; public SourceLoadWorker(SourceSelectionFacade sources) { Modified: sandbox/uisync/code/src/java/pcgen/gui2/PCGenStatusBar.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui2/PCGenStatusBar.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/gui2/PCGenStatusBar.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -22,17 +22,19 @@ import java.util.ArrayList; import java.util.List; +import java.util.logging.LogRecord; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingUtilities; -import pcgen.gui2.util.SimpleTextIcon; +import pcgen.gui2.tools.Icons; import pcgen.gui2.util.SwingWorker; import pcgen.system.PCGenTask; import pcgen.system.PCGenTaskEvent; import pcgen.system.PCGenTaskListener; +import pcgen.util.Logging; /** * This is the southern component of the PCGenFrame. @@ -54,7 +56,7 @@ this.frame = frame; this.messageLabel = new JLabel(); this.progressBar = new JProgressBar(); - this.loadStatusLabel = new JLabel(" "); + this.loadStatusLabel = new JLabel(); initComponents(); } @@ -74,13 +76,26 @@ messageLabel.setText(message); } - public void setSourceLoadErrors(List<String> errors) + public void setSourceLoadErrors(List<LogRecord> errors) { if (errors != null && !errors.isEmpty()) { - //TODO: use a real icon - loadStatusLabel.setIcon(new SimpleTextIcon(this, " ! ")); - loadStatusLabel.setToolTipText("Errors occured while loading the sources"); + loadStatusLabel.setIcon(Icons.Stop16.getImageIcon()); + int nerrors = 0; + int nwarnings = 0; + for (LogRecord logRecord : errors) + { + if (logRecord.getLevel().intValue() > Logging.WARNING.intValue()) + { + nerrors++; + } + else if (logRecord.getLevel().intValue() > Logging.INFO.intValue()) + { + nwarnings++; + } + } + loadStatusLabel.setToolTipText(nerrors + " errors and " + nwarnings + + " warnings occured while loading the sources"); } } @@ -96,18 +111,18 @@ * @param task a PCGenTask * @return a SwingWorker */ - public SwingWorker<List<String>> createWorker(String taskName, PCGenTask task) + public SwingWorker<List<LogRecord>> createWorker(String taskName, PCGenTask task) { return new TaskExecutor(taskName, task); } - private class TaskExecutor extends SwingWorker<List<String>> implements PCGenTaskListener + private class TaskExecutor extends SwingWorker<List<LogRecord>> implements PCGenTaskListener { private final String name; private final PCGenTask task; private boolean dirty = false; - private List<String> errors = new ArrayList<String>(); + private List<LogRecord> errors = new ArrayList<LogRecord>(); public TaskExecutor(String name, PCGenTask task) { @@ -116,7 +131,7 @@ } @Override - public List<String> construct() + public List<LogRecord> construct() { try { @@ -171,7 +186,7 @@ public void errorOccurred(PCGenTaskEvent event) { - errors.add(event.getErrorMessage()); + errors.add(event.getErrorRecord()); } } Modified: sandbox/uisync/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -131,9 +131,11 @@ group.addFilterButton(ccFilterButton); filterBar.addDisplayableFilter(group); FlippingSplitPane splitPane = new FlippingSplitPane(JSplitPane.VERTICAL_SPLIT); + splitPane.setDividerSize(7); + splitPane.setContinuousLayout(true); + splitPane.setOneTouchExpandable(true); + splitPane.setResizeWeight(.25); splitPane.setBottomComponent(FilterUtilities.configureFilteredTreeViewPane(skillTable, filterBar)); - splitPane.setResizeWeight(.5); - JScrollPane tableScrollPane; JPanel tablePanel = new JPanel(new GridBagLayout()); GridBagConstraints constraints = new GridBagConstraints(); Modified: sandbox/uisync/code/src/java/pcgen/system/PCGenTask.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/system/PCGenTask.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/system/PCGenTask.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -25,6 +25,7 @@ import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; import javax.swing.event.EventListenerList; +import pcgen.util.Logging; /** * @@ -122,22 +123,22 @@ protected void sendErrorMessage(Exception e) { - StringWriter stringWriter = new StringWriter(); - e.fillInStackTrace().printStackTrace(new PrintWriter(stringWriter)); - fireErrorOccurredEvent(stringWriter.toString()); + LogRecord record = new LogRecord(Logging.ERROR, e.getMessage()); + record.setThrown(e); + fireErrorOccurredEvent(record); } protected void sendErrorMessage(LogRecord record) { - fireErrorOccurredEvent(new SimpleFormatter().format(record)); + fireErrorOccurredEvent(record); } protected void sendErrorMessage(String message) { - fireErrorOccurredEvent(message); + fireErrorOccurredEvent(new LogRecord(Logging.ERROR, message)); } - protected void fireErrorOccurredEvent(String message) + protected void fireErrorOccurredEvent(LogRecord message) { PCGenTaskEvent taskEvent = null; // Guaranteed to return a non-null array @@ -153,7 +154,7 @@ { taskEvent = new PCGenTaskEvent(this, message); } - ((PCGenTaskListener) listeners[i + 1]).progressChanged(taskEvent); + ((PCGenTaskListener) listeners[i + 1]).errorOccurred(taskEvent); } } } Modified: sandbox/uisync/code/src/java/pcgen/system/PCGenTaskEvent.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/system/PCGenTaskEvent.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/system/PCGenTaskEvent.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -21,6 +21,7 @@ package pcgen.system; import java.util.EventObject; +import java.util.logging.LogRecord; /** * @@ -29,17 +30,17 @@ public class PCGenTaskEvent extends EventObject { - private String errorMessage; + private LogRecord errorRecord; public PCGenTaskEvent(PCGenTask source) { this(source, null); } - public PCGenTaskEvent(PCGenTask source, String errorMessage) + public PCGenTaskEvent(PCGenTask source, LogRecord errorRecord) { super(source); - this.errorMessage = errorMessage; + this.errorRecord = errorRecord; } @Override @@ -48,9 +49,9 @@ return (PCGenTask) super.getSource(); } - public String getErrorMessage() + public LogRecord getErrorRecord() { - return errorMessage; + return errorRecord; } } Modified: sandbox/uisync/code/src/java/pcgen/system/PCGenTaskExecutor.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/system/PCGenTaskExecutor.java 2011-03-15 23:00:17 UTC (rev 14722) +++ sandbox/uisync/code/src/java/pcgen/system/PCGenTaskExecutor.java 2011-03-16 18:12:44 UTC (rev 14723) @@ -68,7 +68,7 @@ public void errorOccurred(PCGenTaskEvent event) { - sendErrorMessage(event.getErrorMessage()); + sendErrorMessage(event.getErrorRecord()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |