From 0e63e608c06f3ec9b81b067ee5529219b5b3ca1e Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:10:12 +0000 Subject: Resumeable -> Resumable git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@170 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../gui/composites/ConfigurationComposite.java | 6 +-- .../exceptions/OutputfolderDontExistException.java | 2 +- .../pdfover/gui/exceptions/ResumableException.java | 59 ++++++++++++++++++++++ .../gui/exceptions/ResumeableException.java | 58 --------------------- 4 files changed, 63 insertions(+), 62 deletions(-) create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumableException.java delete mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumeableException.java (limited to 'pdf-over-gui/src') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java index c170e5df..72bda43b 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java @@ -33,7 +33,7 @@ import at.asit.pdfover.gui.controls.ErrorDialog.ERROR_BUTTONS; import at.asit.pdfover.gui.exceptions.InvalidEmblemFile; import at.asit.pdfover.gui.exceptions.InvalidNumberException; import at.asit.pdfover.gui.exceptions.InvalidPortException; -import at.asit.pdfover.gui.exceptions.ResumeableException; +import at.asit.pdfover.gui.exceptions.ResumableException; import at.asit.pdfover.gui.workflow.ConfigManipulator; import at.asit.pdfover.gui.workflow.ConfigProvider; import at.asit.pdfover.gui.workflow.ConfigurationContainer; @@ -321,7 +321,7 @@ public class ConfigurationComposite extends StateComposite { redo = false; status = true; - } catch (ResumeableException e) { + } catch (ResumableException e) { log.error("Settings validation failed!", e); //$NON-NLS-1$ ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(), ERROR_BUTTONS.ABORT_RETRY_IGNORE); @@ -350,7 +350,7 @@ public class ConfigurationComposite extends StateComposite { redo = false; status = true; - } catch (ResumeableException e) { + } catch (ResumableException e) { log.error("Settings validation failed!", e); //$NON-NLS-1$ ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(), ERROR_BUTTONS.ABORT_RETRY_IGNORE); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/OutputfolderDontExistException.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/OutputfolderDontExistException.java index d7e5ba01..1b7e731b 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/OutputfolderDontExistException.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/OutputfolderDontExistException.java @@ -22,7 +22,7 @@ import at.asit.pdfover.gui.Messages; /** * */ -public class OutputfolderDontExistException extends ResumeableException { +public class OutputfolderDontExistException extends ResumableException { /** * */ diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumableException.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumableException.java new file mode 100644 index 00000000..4d150b44 --- /dev/null +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumableException.java @@ -0,0 +1,59 @@ +/* + * Copyright 2012 by A-SIT, Secure Information Technology Center Austria + * + * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by + * the European Commission - subsequent versions of the EUPL (the "Licence"); + * You may not use this work except in compliance with the Licence. + * You may obtain a copy of the Licence at: + * http://joinup.ec.europa.eu/software/page/eupl + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the Licence is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the Licence for the specific language governing permissions and + * limitations under the Licence. + */ +package at.asit.pdfover.gui.exceptions; + +/** + * + */ +public class ResumableException extends Exception { + + /** + * + */ + private static final long serialVersionUID = -607216270516492225L; + + private int resumeIndex = 0; + + /** + * Create a new resumable exception, thrown by a validator which can be ignored + * @param msg Error message + * @param resumeIndex Validator index to resume from + */ + public ResumableException(String msg, int resumeIndex) { + super(msg); + this.resumeIndex = resumeIndex; + } + + /** + * Create a new resumable exception, thrown by a validator which can be ignored + * @param msg Error message + * @param cause Exception causing this one + * @param resumeIndex Validator index to resume from + */ + public ResumableException(String msg, Throwable cause, int resumeIndex) { + super(msg, cause); + this.resumeIndex = resumeIndex; + } + + /** + * Return the validator index to resume from + * @return the resumeIndex + */ + public int getResumeIndex() { + return this.resumeIndex; + } + +} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumeableException.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumeableException.java deleted file mode 100644 index a4add193..00000000 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/exceptions/ResumeableException.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2012 by A-SIT, Secure Information Technology Center Austria - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://joinup.ec.europa.eu/software/page/eupl - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - */ -package at.asit.pdfover.gui.exceptions; - -/** - * - */ -public class ResumeableException extends Exception { - - /** - * - */ - private static final long serialVersionUID = -607216270516492225L; - - private int resumeIndex = 0; - - /** - * Create a new resumable exception, thrown by a validator which can be ignored - * @param msg Error message - * @param resumeIndex Validator index to resume from - */ - public ResumeableException(String msg, int resumeIndex) { - super(msg); - this.resumeIndex = resumeIndex; - } - - /** - * Create a new resumable exception, thrown by a validator which can be ignored - * @param msg Error message - * @param cause Exception causing this one - * @param resumeIndex Validator index to resume from - */ - public ResumeableException(String msg, Throwable cause, int resumeIndex) { - super(msg, cause); - this.resumeIndex = resumeIndex; - } - - /** - * @return the resumeIndex - */ - public int getResumeIndex() { - return this.resumeIndex; - } - -} -- cgit v1.2.3