Skip to content
Snippets Groups Projects
Commit 6523e0bc authored by Falilou Thiam's avatar Falilou Thiam
Browse files

declare throwing ArchivingException instead of Exception

parent 729461c0
Branches
Tags
No related merge requests found
......@@ -349,9 +349,9 @@ public class DefaultLifeCycleManager implements LifeCycleManager {
/**
* Saves the application's favorites.
*
* @throws Exception
* @throws ArchivingException
*/
private void saveFavorites() throws Exception {
private void saveFavorites() throws ArchivingException {
try {
final Favorites favoritesToSave = Favorites.getInstance();
final IFavoritesManager favoritesManager = FavoritesManagerFactory.getCurrentImpl();
......@@ -370,9 +370,9 @@ public class DefaultLifeCycleManager implements LifeCycleManager {
/**
* Saves the application's options.
*
* @throws Exception
* @throws ArchivingException
*/
private void saveOptions() throws Exception {
private void saveOptions() throws ArchivingException {
try {
final Options optionsToSave = Options.getInstance();
final IOptionsManager optionsManager = OptionsManagerFactory.getCurrentImpl();
......@@ -390,9 +390,9 @@ public class DefaultLifeCycleManager implements LifeCycleManager {
/**
* Saves the application's history.
*
* @throws Exception
* @throws ArchivingException
*/
private void saveHistory() throws Exception {
private void saveHistory() throws ArchivingException {
try {
final History historyToSave = History.getCurrentHistory();
final IHistoryManager historyManager = HistoryManagerFactory.getCurrentImpl();
......
......@@ -32,6 +32,7 @@ package fr.soleil.bensikin.options;
import java.util.ArrayList;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.archiving.gui.tools.GUIUtilities;
import fr.soleil.bensikin.options.sub.ContextOptions;
import fr.soleil.bensikin.options.sub.DisplayOptions;
......@@ -90,9 +91,9 @@ public class Options {
* Delegates push to each option part: Display, print, logs , save,
* wordlist, and snapshot options are pushed.
*
* @throws Exception
* @throws ArchivingException
*/
public void push() throws Exception {
public void push() throws ArchivingException {
final StringBuilder errorBuffer = new StringBuilder();
final ArrayList<StackTraceElement> errorStack = new ArrayList<StackTraceElement>();
try {
......
......@@ -26,6 +26,8 @@
//-======================================================================
package fr.soleil.bensikin.options;
import fr.soleil.archiving.common.api.exception.ArchivingException;
/**
* Represents a sub-set of the application's options, an "option book", that can
* do two things:
......@@ -45,7 +47,7 @@ public interface PushPullOptionBook {
/**
* Fills the options dialog with the values of its attributes
*
* @throws Exception
* @throws ArchivingException
*/
public void push() throws Exception;
public void push() throws ArchivingException;
}
......@@ -36,6 +36,7 @@ import java.util.Map.Entry;
import javax.swing.ButtonModel;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.archiving.gui.tools.GUIUtilities;
import fr.soleil.bensikin.containers.context.ContextDetailPanel;
import fr.soleil.bensikin.containers.sub.dialogs.options.OptionsContextTab;
......@@ -101,12 +102,12 @@ public class ContextOptions extends ReadWriteOptionBook implements PushPullOptio
* @see bensikin.bensikin.options.PushPullOptionBook#push()
*/
@Override
public void push() throws Exception {
public void push() throws ArchivingException {
pushSelectionMode();
}
public void pushSelectionMode() throws Exception {
public void pushSelectionMode() throws ArchivingException {
final String plaf_s = content.get(SELECTION_MODE);
if (plaf_s != null) {
......
......@@ -28,6 +28,7 @@ package fr.soleil.bensikin.options.sub;
import javax.swing.ButtonModel;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.bensikin.containers.sub.dialogs.options.OptionsDisplayTab;
import fr.soleil.bensikin.options.PushPullOptionBook;
import fr.soleil.bensikin.options.ReadWriteOptionBook;
......@@ -37,8 +38,7 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author CLAISSE
*/
public class DisplayOptions extends ReadWriteOptionBook implements
PushPullOptionBook {
public class DisplayOptions extends ReadWriteOptionBook implements PushPullOptionBook {
/**
* The pluggable look-and-feel property name
*/
......@@ -73,6 +73,7 @@ public class DisplayOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
*/
@Override
public void fillFromOptionsDialog() {
OptionsDisplayTab displayTab = OptionsDisplayTab.getInstance();
ButtonModel selectedModel = displayTab.getButtonGroup().getSelection();
......@@ -86,7 +87,8 @@ public class DisplayOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#push()
*/
public void push() throws Exception {
@Override
public void push() throws ArchivingException {
/*
* String plaf_s = ( String ) this.content.get( PLAF ); if ( plaf_s !=
* null ) { int plaf = Integer.parseInt( plaf_s ); switch ( plaf ) {
......
......@@ -34,6 +34,7 @@ package fr.soleil.bensikin.options.sub;
import java.awt.print.PageFormat;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.archiving.gui.tools.ComponentPrinter;
import fr.soleil.bensikin.containers.sub.dialogs.options.OptionsPrintTab;
import fr.soleil.bensikin.options.PushPullOptionBook;
......@@ -44,8 +45,7 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author GIRARDOT
*/
public class PrintOptions extends ReadWriteOptionBook implements
PushPullOptionBook {
public class PrintOptions extends ReadWriteOptionBook implements PushPullOptionBook {
/**
* The XML tag name used in saving/loading
......@@ -78,6 +78,7 @@ public class PrintOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
*/
@Override
public void fillFromOptionsDialog() {
OptionsPrintTab printTab = OptionsPrintTab.getInstance();
// Orientation
......@@ -101,13 +102,13 @@ public class PrintOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#push()
*/
public void push() throws Exception {
@Override
public void push() throws ArchivingException {
OptionsPrintTab printTab = OptionsPrintTab.getInstance();
orientation = PageFormat.LANDSCAPE;
try {
orientation = Integer.parseInt((String) this.content
.get(PRINT_ORIENTATION));
orientation = Integer.parseInt(this.content.get(PRINT_ORIENTATION));
} catch (NumberFormatException nfe) {
orientation = PageFormat.LANDSCAPE;
}
......@@ -119,8 +120,7 @@ public class PrintOptions extends ReadWriteOptionBook implements
fitMode = ComponentPrinter.FIT_PAGE;
try {
fitMode = Integer.parseInt((String) this.content
.get(PRINT_FIT_MODE));
fitMode = Integer.parseInt(this.content.get(PRINT_FIT_MODE));
} catch (NumberFormatException nfe) {
fitMode = ComponentPrinter.FIT_PAGE;
}
......
......@@ -31,6 +31,7 @@ package fr.soleil.bensikin.options.sub;
import javax.swing.ButtonModel;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.bensikin.containers.sub.dialogs.options.OptionsWordlistTab;
import fr.soleil.bensikin.options.PushPullOptionBook;
import fr.soleil.bensikin.options.ReadWriteOptionBook;
......@@ -40,8 +41,7 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author CLAISSE
*/
public class WordlistOptions extends ReadWriteOptionBook implements
PushPullOptionBook {
public class WordlistOptions extends ReadWriteOptionBook implements PushPullOptionBook {
/**
* The wordlist saving property name
*/
......@@ -76,6 +76,7 @@ public class WordlistOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
*/
@Override
public void fillFromOptionsDialog() {
OptionsWordlistTab wordlistTab = OptionsWordlistTab.getInstance();
ButtonModel selectedModel = wordlistTab.getButtonGroup().getSelection();
......@@ -89,8 +90,9 @@ public class WordlistOptions extends ReadWriteOptionBook implements
*
* @see bensikin.bensikin.options.PushPullOptionBook#push()
*/
public void push() throws Exception {
String val_s = (String) this.content.get(WORDLIST);
@Override
public void push() throws ArchivingException {
String val_s = this.content.get(WORDLIST);
if (val_s != null) {
int val = Integer.parseInt(val_s);
// LifeCycleManager lifeCycleManager =
......
......@@ -36,6 +36,8 @@ import java.util.ResourceBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.soleil.archiving.common.api.exception.ArchivingException;
/**
* The class in charge of internationalization. Uses 2 resource bundles, one for
* the application's labels, and a smaller one for all log messages and error
......@@ -58,7 +60,7 @@ public class Messages {
* The locale used by the application
* @throws Exception
*/
public static void initResourceBundle(final Locale currentLocale) throws Exception {
public static void initResourceBundle(final Locale currentLocale) throws ArchivingException {
try {
myResources = ResourceBundle.getBundle("fr.soleil.bensikin.resources.messages.resources", currentLocale);
myLogResources = ResourceBundle.getBundle("fr.soleil.bensikin.resources.messages.logs", currentLocale);
......@@ -68,8 +70,7 @@ public class Messages {
// failure message in the ressources..
final String msg = "Failed to load resources";
LOGGER.error("CRITIC " + msg, e);
throw e;
throw ArchivingException.toArchivingException(e);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment