Updated preference constants for the Office Handler
This commit introduces two changes:
1) It increases the number of characters shown in the Office View
from 30 to 80, thus making it easier to see the content of, e.g.,
the lines of a spreadsheet.
2) It changes the text displayed in the Eclipse Capra preferences
to clarify the meaning of the different options for the Office
handler.
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
index 6109fc9..8f2493c 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
@@ -55,7 +55,7 @@
/**
* Default preference values
*/
- public static final String CHAR_COUNT_DEFAULT = "30";
+ public static final String CHAR_COUNT_DEFAULT = "80";
public static final boolean EXCEL_COLUMN_RADIO_ID_IS_LINE_NUMBER = true;
public static final String EXCEL_CUSTOM_COLUMN_DEFAULT = "A";
public static final String EXCEL_COLUMN_VALUE_DEFAULT = "0";
@@ -65,11 +65,11 @@
* Description of controls
*/
private static final String CHAR_COUNT_DESC = "Number of characters that are shown per line in the Office view:";
- private static final String EXCEL_COLUMN_RADIO_CHOICE_DESC = "Setting the ID of Excel rows:";
- private static final String EXCEL_COLUMN_IS_LINE_NUMBER_OPTION_DESC = "Line number is used as ID";
- private static final String EXCEL_COLUMN_IS_CUSTOM_OPTION_DESC = "Custom ID column: ";
+ private static final String EXCEL_COLUMN_RADIO_CHOICE_DESC = "Unique identifier in spreadsheets:";
+ private static final String EXCEL_COLUMN_IS_LINE_NUMBER_OPTION_DESC = "Use the line number as the ID";
+ private static final String EXCEL_COLUMN_IS_CUSTOM_OPTION_DESC = "Use this column as the ID: ";
private static final String EXCEL_COLUMN_IS_CUSTOM_OPTION_HINT = "(e.g. \"A\", \"BC\"...)";
- private static final String WORD_FIELD_NAME_DESC = "ID of Word fields to display: ";
+ private static final String WORD_FIELD_NAME_DESC = "Name of Word field to display:";
private static final int FIXED_TEXT_FIELD_WIDTH = 35;
@@ -86,11 +86,9 @@
* Creates a swt widget that takes the numColumns of grid space inside the
* parent.
*
- * @param parent
- * the element that will hold the widget
- * @param numColumns
- * the number of columns that the widget will take inside the
- * grid of the parent.
+ * @param parent the element that will hold the widget
+ * @param numColumns the number of columns that the widget will take inside the
+ * grid of the parent.
* @return the created widget
*/
private Composite createComposite(Composite parent, int numColumns) {
@@ -229,15 +227,12 @@
}
/**
- * Creates a label widget that takes the width of numOfColumns grid cells
- * inside a parent.
+ * Creates a label widget that takes the width of numOfColumns grid cells inside
+ * a parent.
*
- * @param parent
- * the element that will hold the label.
- * @param text
- * the text of the label.
- * @param numOfColumns
- * the width (in grid cells) of the label.
+ * @param parent the element that will hold the label.
+ * @param text the text of the label.
+ * @param numOfColumns the width (in grid cells) of the label.
* @return newly created Label object
*/
private Label createLabel(Composite parent, String text, int numOfColumns) {
@@ -251,15 +246,12 @@
}
/**
- * Creates a Text widget that takes the width of numOfColumns grid cells
- * inside a parent.
+ * Creates a Text widget that takes the width of numOfColumns grid cells inside
+ * a parent.
*
- * @param parent
- * the element that will hold the label.
- * @param numOfColumns
- * the width (in grid cells) of the widget.
- * @param minimumWidth
- * the minimum width of the Text widget.
+ * @param parent the element that will hold the label.
+ * @param numOfColumns the width (in grid cells) of the widget.
+ * @param minimumWidth the minimum width of the Text widget.
* @return the newly created Text widget.
*/
private Text createTextField(Composite parent, int numOfColumns, int minimumWidth) {
@@ -279,12 +271,9 @@
* Creates a Button widget that takes the width of numOfColumns grid cells
* inside a parent.
*
- * @param parent
- * the element that will hold the label.
- * @param label
- * the text of the widget.
- * @param numOfColumns
- * the width (in grid cells) of the widget.
+ * @param parent the element that will hold the label.
+ * @param label the text of the widget.
+ * @param numOfColumns the width (in grid cells) of the widget.
* @return the newly created Button widget.
*/
private Button createRadioButton(Composite parent, String label, int numOfColumns) {
