From: <jde...@us...> - 2013-02-11 11:45:03
|
Revision: 19445 http://sourceforge.net/p/pcgen/code/19445 Author: jdempsey Date: 2013-02-11 11:44:59 +0000 (Mon, 11 Feb 2013) Log Message: ----------- Data Converter - Reduce Next clicks Issue#: CODE-2064 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/converter/ConvertPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/converter/PCGenDataConvert.java Trunk/pcgen/code/src/java/pcgen/gui2/converter/event/ProgressEvent.java Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/ConvertSubPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/StartupPanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/ConvertPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/ConvertPanel.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/ConvertPanel.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -119,7 +119,14 @@ @Override public void progressAllowed(ProgressEvent pe) { - nextButton.setEnabled(true); + if (pe.getID() == ProgressEvent.AUTO_ADVANCE) + { + proceedToNextPanel(); + } + else + { + nextButton.setEnabled(true); + } } @Override @@ -133,17 +140,7 @@ @Override public void actionPerformed(ActionEvent arg0) { - Thread t = new Thread(new Runnable() - { - @Override - public void run() - { - CursorControlUtilities.startWaitCursor(basePanel); - runNextPanel(); - CursorControlUtilities.stopWaitCursor(basePanel); - } - }); - t.start(); + proceedToNextPanel(); } }); buttonBox.add(nextButton); @@ -190,6 +187,21 @@ runNextPanel(); } + private void proceedToNextPanel() + { + Thread t = new Thread(new Runnable() + { + @Override + public void run() + { + CursorControlUtilities.startWaitCursor(basePanel); + runNextPanel(); + CursorControlUtilities.stopWaitCursor(basePanel); + } + }); + t.start(); + } + public void prepare(ConvertSubPanel panel, boolean allowPrev) { setButtonVisibility(panel.isLast(), allowPrev); @@ -201,10 +213,16 @@ { nextButton.setEnabled(false); prevButton.setEnabled(allowPrev); - finishButton.setVisible(displayingLast); - cancelButton.setVisible(!displayingLast); + //finishButton.setVisible(displayingLast); + cancelButton.setVisible(true); } + private void showFinishButton() + { + finishButton.setVisible(true); + cancelButton.setVisible(false); + } + public void checkExit() { int response = JOptionPane.showConfirmDialog(this, @@ -239,6 +257,7 @@ else { nextpanel = null; + showFinishButton(); } } while (nextpanel != null && nextpanel.autoAdvance(properties)); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/PCGenDataConvert.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/PCGenDataConvert.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/PCGenDataConvert.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -98,8 +98,6 @@ panels.add(new SummaryPanel()); panels.add(new RunConvertPanel(installPanel.getStatusField())); - panels.add(new MessagePanel("PCGen Data Conversion Complete!", - ProgressEvent.NOT_ALLOWED)); frame.getContentPane().add(installPanel); frame.pack(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/event/ProgressEvent.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/event/ProgressEvent.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/event/ProgressEvent.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -28,6 +28,8 @@ public static final int ALLOWED = 0; + public static final int AUTO_ADVANCE = 2; + private int ident; public ProgressEvent(Object arg0, int id) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/ConvertSubPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/ConvertSubPanel.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/ConvertSubPanel.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -136,6 +136,7 @@ switch (ccEvent.getID()) { case ProgressEvent.ALLOWED: + case ProgressEvent.AUTO_ADVANCE: ((ProgressListener) listeners[i + 1]) .progressAllowed(ccEvent); break; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/RunConvertPanel.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -200,7 +200,7 @@ } progressBar.setValue(progressBar.getMaximum()); - fireProgressEvent(ProgressEvent.ALLOWED); + fireProgressEvent(ProgressEvent.AUTO_ADVANCE); } }).start(); return true; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/StartupPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/StartupPanel.java 2013-02-11 07:55:29 UTC (rev 19444) +++ Trunk/pcgen/code/src/java/pcgen/gui2/converter/panel/StartupPanel.java 2013-02-11 11:44:59 UTC (rev 19445) @@ -84,7 +84,7 @@ message.add(new JLabel("Initialization complete, press next button to continue...")); message.revalidate(); - fireProgressEvent(ProgressEvent.ALLOWED); + fireProgressEvent(ProgressEvent.AUTO_ADVANCE); } }).start(); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |