diff --git a/src/main/java/fr/soleil/bensikin/lifecycle/DefaultLifeCycleManager.java b/src/main/java/fr/soleil/bensikin/lifecycle/DefaultLifeCycleManager.java
index ca5ed5f75d643ab1d938dd7f554fc7acef025983..2c64438963df07c8f25b107b9895e48fda6fd638 100644
--- a/src/main/java/fr/soleil/bensikin/lifecycle/DefaultLifeCycleManager.java
+++ b/src/main/java/fr/soleil/bensikin/lifecycle/DefaultLifeCycleManager.java
@@ -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();
diff --git a/src/main/java/fr/soleil/bensikin/options/Options.java b/src/main/java/fr/soleil/bensikin/options/Options.java
index ef205668f1fe1c33360209a0336daea35799cd58..5a29c73eda0d3725a71f2fe009424c032dbd8e8a 100644
--- a/src/main/java/fr/soleil/bensikin/options/Options.java
+++ b/src/main/java/fr/soleil/bensikin/options/Options.java
@@ -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 {
diff --git a/src/main/java/fr/soleil/bensikin/options/PushPullOptionBook.java b/src/main/java/fr/soleil/bensikin/options/PushPullOptionBook.java
index 1fb6d194e46d8de35754bcf8c0c10bdc33b99b86..00ec7561b27095406ae817621020657369ffde88 100644
--- a/src/main/java/fr/soleil/bensikin/options/PushPullOptionBook.java
+++ b/src/main/java/fr/soleil/bensikin/options/PushPullOptionBook.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
// $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/PushPullOptionBook.java,v $
//
// Project: Tango Archiving Service
@@ -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:
@@ -37,15 +39,15 @@ package fr.soleil.bensikin.options;
* @author CLAISSE
*/
public interface PushPullOptionBook {
- /**
- * Fills itself from an options dialog
- */
- public void fillFromOptionsDialog();
+ /**
+ * Fills itself from an options dialog
+ */
+ public void fillFromOptionsDialog();
- /**
- * Fills the options dialog with the values of its attributes
- *
- * @throws Exception
- */
- public void push() throws Exception;
+ /**
+ * Fills the options dialog with the values of its attributes
+ *
+ * @throws ArchivingException
+ */
+ public void push() throws ArchivingException;
}
diff --git a/src/main/java/fr/soleil/bensikin/options/sub/ContextOptions.java b/src/main/java/fr/soleil/bensikin/options/sub/ContextOptions.java
index 48447af7f73800effeebe8db412909e35a9d8b95..33461a9f86266b120512dc126b9cf987671b4682 100644
--- a/src/main/java/fr/soleil/bensikin/options/sub/ContextOptions.java
+++ b/src/main/java/fr/soleil/bensikin/options/sub/ContextOptions.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
//$Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/sub/ContextOptions.java,v $
//
//Project: Tango Archiving Service
@@ -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;
@@ -85,13 +86,13 @@ public class ContextOptions extends ReadWriteOptionBook implements PushPullOptio
// boolean isAlternate = false;
switch (plaf) {
- case SELECTION_MODE_TREE:
- isAlternateSelectionMode = false;
- break;
+ case SELECTION_MODE_TREE:
+ isAlternateSelectionMode = false;
+ break;
- case SELECTION_MODE_TABLE:
- isAlternateSelectionMode = true;
- break;
+ case SELECTION_MODE_TABLE:
+ isAlternateSelectionMode = true;
+ break;
}
}
@@ -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) {
@@ -114,13 +115,13 @@ public class ContextOptions extends ReadWriteOptionBook implements PushPullOptio
boolean isAlternate = false;
switch (plaf) {
- case SELECTION_MODE_TREE:
- isAlternate = false;
- break;
+ case SELECTION_MODE_TREE:
+ isAlternate = false;
+ break;
- case SELECTION_MODE_TABLE:
- isAlternate = true;
- break;
+ case SELECTION_MODE_TABLE:
+ isAlternate = true;
+ break;
}
isAlternateSelectionMode = isAlternate;
diff --git a/src/main/java/fr/soleil/bensikin/options/sub/DisplayOptions.java b/src/main/java/fr/soleil/bensikin/options/sub/DisplayOptions.java
index 06994e6e1546b2a26b473ac2f6850ef4ad884e5e..adc212ea11b094906c2e4f7af07395e8291a8e2e 100644
--- a/src/main/java/fr/soleil/bensikin/options/sub/DisplayOptions.java
+++ b/src/main/java/fr/soleil/bensikin/options/sub/DisplayOptions.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
// $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/sub/DisplayOptions.java,v $
//
// Project: Tango Archiving Service
@@ -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,73 +38,74 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author CLAISSE
*/
-public class DisplayOptions extends ReadWriteOptionBook implements
- PushPullOptionBook {
- /**
- * The pluggable look-and-feel property name
- */
- public static final String PLAF = "PLAF";
+public class DisplayOptions extends ReadWriteOptionBook implements PushPullOptionBook {
+ /**
+ * The pluggable look-and-feel property name
+ */
+ public static final String PLAF = "PLAF";
- /**
- * The code for the pluggable look-and-feel property value of
- * "Windows look-and-feel"
- */
- public static final int PLAF_WIN = 0;
+ /**
+ * The code for the pluggable look-and-feel property value of
+ * "Windows look-and-feel"
+ */
+ public static final int PLAF_WIN = 0;
- /**
- * The code for the pluggable look-and-feel property value of
- * "JAVA look-and-feel"
- */
- public static final int PLAF_JAVA = 1;
+ /**
+ * The code for the pluggable look-and-feel property value of
+ * "JAVA look-and-feel"
+ */
+ public static final int PLAF_JAVA = 1;
- /**
- * The XML tag name used in saving/loading
- */
- public static final String XML_TAG = "display";
+ /**
+ * The XML tag name used in saving/loading
+ */
+ public static final String XML_TAG = "display";
- /**
- * Default constructor
- */
- public DisplayOptions() {
- super(XML_TAG);
- }
+ /**
+ * Default constructor
+ */
+ public DisplayOptions() {
+ super(XML_TAG);
+ }
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
- */
- public void fillFromOptionsDialog() {
- OptionsDisplayTab displayTab = OptionsDisplayTab.getInstance();
- ButtonModel selectedModel = displayTab.getButtonGroup().getSelection();
- String selectedActionCommand = selectedModel.getActionCommand();
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
+ */
+ @Override
+ public void fillFromOptionsDialog() {
+ OptionsDisplayTab displayTab = OptionsDisplayTab.getInstance();
+ ButtonModel selectedModel = displayTab.getButtonGroup().getSelection();
+ String selectedActionCommand = selectedModel.getActionCommand();
- this.content.put(PLAF, selectedActionCommand);
- }
+ this.content.put(PLAF, selectedActionCommand);
+ }
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#push()
- */
- public void push() throws Exception {
- /*
- * String plaf_s = ( String ) this.content.get( PLAF ); if ( plaf_s !=
- * null ) { int plaf = Integer.parseInt( plaf_s ); switch ( plaf ) {
- * case PLAF_WIN: UIManager.setLookAndFeel(
- * "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" ); break;
- *
- * case PLAF_JAVA: UIManager.setLookAndFeel(
- * UIManager.getCrossPlatformLookAndFeelClassName() ); break; }
- *
- * BensikinFrame frame = BensikinFrame.getInstance();
- * SwingUtilities.updateComponentTreeUI( frame );
- *
- * OptionsDisplayTab displayTab = OptionsDisplayTab.getInstance();
- * displayTab.selectPlafButton( plaf );
- *
- * OptionsDialog.resetInstance(); }
- */
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#push()
+ */
+ @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 ) {
+ * case PLAF_WIN: UIManager.setLookAndFeel(
+ * "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" ); break;
+ *
+ * case PLAF_JAVA: UIManager.setLookAndFeel(
+ * UIManager.getCrossPlatformLookAndFeelClassName() ); break; }
+ *
+ * BensikinFrame frame = BensikinFrame.getInstance();
+ * SwingUtilities.updateComponentTreeUI( frame );
+ *
+ * OptionsDisplayTab displayTab = OptionsDisplayTab.getInstance();
+ * displayTab.selectPlafButton( plaf );
+ *
+ * OptionsDialog.resetInstance(); }
+ */
- }
+ }
}
diff --git a/src/main/java/fr/soleil/bensikin/options/sub/PrintOptions.java b/src/main/java/fr/soleil/bensikin/options/sub/PrintOptions.java
index 139e15f4052cfb785d6f2b07ce828ac7e575f1b2..cc69d321b3f2663870f5523ed487ff896d05eb8c 100644
--- a/src/main/java/fr/soleil/bensikin/options/sub/PrintOptions.java
+++ b/src/main/java/fr/soleil/bensikin/options/sub/PrintOptions.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
// $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/sub/PrintOptions.java,v $
//
// Project: Tango Archiving Service
@@ -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,124 +45,123 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author GIRARDOT
*/
-public class PrintOptions extends ReadWriteOptionBook implements
- PushPullOptionBook {
-
- /**
- * The XML tag name used in saving/loading
- */
- public static final String XML_TAG = "print";
-
- /**
- * The print orientation for CSV extraction
- */
- public static final String PRINT_ORIENTATION = "PRINT_ORIENTATION";
-
- /**
- * The print fit mode for CSV extraction
- */
- public static final String PRINT_FIT_MODE = "PRINT_FIT_MODE";
-
- private int orientation = ComponentPrinter.LANDSCAPE;
-
- private int fitMode = ComponentPrinter.FIT_PAGE;
-
- /**
- * Default constructor
- */
- public PrintOptions() {
- super(XML_TAG);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
- */
- public void fillFromOptionsDialog() {
- OptionsPrintTab printTab = OptionsPrintTab.getInstance();
- // Orientation
- orientation = PageFormat.LANDSCAPE;
- if (printTab.isPortrait()) {
- orientation = PageFormat.PORTRAIT;
- }
- this.content.put(PRINT_ORIENTATION, Integer.toString(orientation));
-
- fitMode = ComponentPrinter.FIT_PAGE;
- if (printTab.isFitWidth()) {
- fitMode = ComponentPrinter.FIT_PAGE_WIDTH;
- } else if (printTab.isNoFit()) {
- fitMode = ComponentPrinter.NO_FIT;
- }
- this.content.put(PRINT_FIT_MODE, Integer.toString(fitMode));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#push()
- */
- public void push() throws Exception {
- OptionsPrintTab printTab = OptionsPrintTab.getInstance();
-
- orientation = PageFormat.LANDSCAPE;
- try {
- orientation = Integer.parseInt((String) this.content
- .get(PRINT_ORIENTATION));
- } catch (NumberFormatException nfe) {
- orientation = PageFormat.LANDSCAPE;
- }
- if (orientation == PageFormat.PORTRAIT) {
- printTab.setPortrait(true);
- } else {
- printTab.setLandscape(true);
- }
-
- fitMode = ComponentPrinter.FIT_PAGE;
- try {
- fitMode = Integer.parseInt((String) this.content
- .get(PRINT_FIT_MODE));
- } catch (NumberFormatException nfe) {
- fitMode = ComponentPrinter.FIT_PAGE;
- }
- if (fitMode == ComponentPrinter.FIT_PAGE_WIDTH) {
- printTab.setFitWidth(true);
- } else if (fitMode == ComponentPrinter.NO_FIT) {
- printTab.setNoFit(true);
- } else {
- printTab.setFitPage(true);
- }
-
- }
-
- /**
- * @return the orientation
- */
- public int getOrientation() {
- return orientation;
- }
-
- /**
- * @param orientation
- * the orientation to set
- */
- public void setOrientation(int orientation) {
- this.orientation = orientation;
- }
-
- /**
- * @return the fitMode
- */
- public int getFitMode() {
- return fitMode;
- }
-
- /**
- * @param fitMode
- * the fitMode to set
- */
- public void setFitMode(int fitMode) {
- this.fitMode = fitMode;
- }
+public class PrintOptions extends ReadWriteOptionBook implements PushPullOptionBook {
+
+ /**
+ * The XML tag name used in saving/loading
+ */
+ public static final String XML_TAG = "print";
+
+ /**
+ * The print orientation for CSV extraction
+ */
+ public static final String PRINT_ORIENTATION = "PRINT_ORIENTATION";
+
+ /**
+ * The print fit mode for CSV extraction
+ */
+ public static final String PRINT_FIT_MODE = "PRINT_FIT_MODE";
+
+ private int orientation = ComponentPrinter.LANDSCAPE;
+
+ private int fitMode = ComponentPrinter.FIT_PAGE;
+
+ /**
+ * Default constructor
+ */
+ public PrintOptions() {
+ super(XML_TAG);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
+ */
+ @Override
+ public void fillFromOptionsDialog() {
+ OptionsPrintTab printTab = OptionsPrintTab.getInstance();
+ // Orientation
+ orientation = PageFormat.LANDSCAPE;
+ if (printTab.isPortrait()) {
+ orientation = PageFormat.PORTRAIT;
+ }
+ this.content.put(PRINT_ORIENTATION, Integer.toString(orientation));
+
+ fitMode = ComponentPrinter.FIT_PAGE;
+ if (printTab.isFitWidth()) {
+ fitMode = ComponentPrinter.FIT_PAGE_WIDTH;
+ } else if (printTab.isNoFit()) {
+ fitMode = ComponentPrinter.NO_FIT;
+ }
+ this.content.put(PRINT_FIT_MODE, Integer.toString(fitMode));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#push()
+ */
+ @Override
+ public void push() throws ArchivingException {
+ OptionsPrintTab printTab = OptionsPrintTab.getInstance();
+
+ orientation = PageFormat.LANDSCAPE;
+ try {
+ orientation = Integer.parseInt(this.content.get(PRINT_ORIENTATION));
+ } catch (NumberFormatException nfe) {
+ orientation = PageFormat.LANDSCAPE;
+ }
+ if (orientation == PageFormat.PORTRAIT) {
+ printTab.setPortrait(true);
+ } else {
+ printTab.setLandscape(true);
+ }
+
+ fitMode = ComponentPrinter.FIT_PAGE;
+ try {
+ fitMode = Integer.parseInt(this.content.get(PRINT_FIT_MODE));
+ } catch (NumberFormatException nfe) {
+ fitMode = ComponentPrinter.FIT_PAGE;
+ }
+ if (fitMode == ComponentPrinter.FIT_PAGE_WIDTH) {
+ printTab.setFitWidth(true);
+ } else if (fitMode == ComponentPrinter.NO_FIT) {
+ printTab.setNoFit(true);
+ } else {
+ printTab.setFitPage(true);
+ }
+
+ }
+
+ /**
+ * @return the orientation
+ */
+ public int getOrientation() {
+ return orientation;
+ }
+
+ /**
+ * @param orientation
+ * the orientation to set
+ */
+ public void setOrientation(int orientation) {
+ this.orientation = orientation;
+ }
+
+ /**
+ * @return the fitMode
+ */
+ public int getFitMode() {
+ return fitMode;
+ }
+
+ /**
+ * @param fitMode
+ * the fitMode to set
+ */
+ public void setFitMode(int fitMode) {
+ this.fitMode = fitMode;
+ }
}
diff --git a/src/main/java/fr/soleil/bensikin/options/sub/WordlistOptions.java b/src/main/java/fr/soleil/bensikin/options/sub/WordlistOptions.java
index c20aa63bbb186bf562662dbde838d068a96cbf20..b1ea274e31734c549a92d2fc5ebf4c68454fd229 100644
--- a/src/main/java/fr/soleil/bensikin/options/sub/WordlistOptions.java
+++ b/src/main/java/fr/soleil/bensikin/options/sub/WordlistOptions.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
// $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/sub/WordlistOptions.java,v $
//
// Project: Tango Archiving Service
@@ -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,79 +41,80 @@ import fr.soleil.bensikin.options.ReadWriteOptionBook;
*
* @author CLAISSE
*/
-public class WordlistOptions extends ReadWriteOptionBook implements
- PushPullOptionBook {
- /**
- * The wordlist saving property name
- */
- public static final String WORDLIST = "WORDLIST";
- /**
- * Use the Soleil wordlist
- */
- public static final int WORDLIST_SOLEIL = 0;
- /**
- * Use the Tango wordlist
- */
- public static final int WORDLIST_TANGO = 1;
- /**
- * Use a custom wordlist
- */
- public static final int WORDLIST_CUSTOM = 2;
+public class WordlistOptions extends ReadWriteOptionBook implements PushPullOptionBook {
+ /**
+ * The wordlist saving property name
+ */
+ public static final String WORDLIST = "WORDLIST";
+ /**
+ * Use the Soleil wordlist
+ */
+ public static final int WORDLIST_SOLEIL = 0;
+ /**
+ * Use the Tango wordlist
+ */
+ public static final int WORDLIST_TANGO = 1;
+ /**
+ * Use a custom wordlist
+ */
+ public static final int WORDLIST_CUSTOM = 2;
- /**
- * The XML tag name used in saving/loading
- */
- public static final String XML_TAG = "wordlist";
+ /**
+ * The XML tag name used in saving/loading
+ */
+ public static final String XML_TAG = "wordlist";
- /**
- * Default constructor
- */
- public WordlistOptions() {
- super(XML_TAG);
- }
+ /**
+ * Default constructor
+ */
+ public WordlistOptions() {
+ super(XML_TAG);
+ }
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
- */
- public void fillFromOptionsDialog() {
- OptionsWordlistTab wordlistTab = OptionsWordlistTab.getInstance();
- ButtonModel selectedModel = wordlistTab.getButtonGroup().getSelection();
- String selectedActionCommand = selectedModel.getActionCommand();
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#fillFromOptionsDialog()
+ */
+ @Override
+ public void fillFromOptionsDialog() {
+ OptionsWordlistTab wordlistTab = OptionsWordlistTab.getInstance();
+ ButtonModel selectedModel = wordlistTab.getButtonGroup().getSelection();
+ String selectedActionCommand = selectedModel.getActionCommand();
- this.content.put(WORDLIST, selectedActionCommand);
- }
+ this.content.put(WORDLIST, selectedActionCommand);
+ }
- /*
- * (non-Javadoc)
- *
- * @see bensikin.bensikin.options.PushPullOptionBook#push()
- */
- public void push() throws Exception {
- String val_s = (String) this.content.get(WORDLIST);
- if (val_s != null) {
- int val = Integer.parseInt(val_s);
- // LifeCycleManager lifeCycleManager =
- // LifeCycleManagerFactory.getCurrentImpl();
+ /*
+ * (non-Javadoc)
+ *
+ * @see bensikin.bensikin.options.PushPullOptionBook#push()
+ */
+ @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 =
+ // LifeCycleManagerFactory.getCurrentImpl();
- switch (val) {
- case WORDLIST_SOLEIL:
- // do nothing for now
- break;
+ switch (val) {
+ case WORDLIST_SOLEIL:
+ // do nothing for now
+ break;
- case WORDLIST_TANGO:
- // do nothing for now
- break;
+ case WORDLIST_TANGO:
+ // do nothing for now
+ break;
- case WORDLIST_CUSTOM:
- // do nothing for now
- break;
- }
+ case WORDLIST_CUSTOM:
+ // do nothing for now
+ break;
+ }
- OptionsWordlistTab saveTab = OptionsWordlistTab.getInstance();
- saveTab.selectWordlistButton(val);
- }
- }
+ OptionsWordlistTab saveTab = OptionsWordlistTab.getInstance();
+ saveTab.selectWordlistButton(val);
+ }
+ }
}
diff --git a/src/main/java/fr/soleil/bensikin/tools/Messages.java b/src/main/java/fr/soleil/bensikin/tools/Messages.java
index b6768088ac11c0631ca4dde139b10ccb9e377cb5..e0ca1f6df349154fe98b6ba44cf61e6a5b6b9ab2 100644
--- a/src/main/java/fr/soleil/bensikin/tools/Messages.java
+++ b/src/main/java/fr/soleil/bensikin/tools/Messages.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
// $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/tools/Messages.java,v $
//
// Project: Tango Archiving Service
@@ -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);
}
}