You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:21:35 UTC
svn commit: r480241 [3/5] - in
/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima:
taeconfigurator/ taeconfigurator/editors/ taeconfigurator/editors/ui/
taeconfigurator/editors/ui/dialogs/ taeconfigurator/editors/xml/ taeco...
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterDelegatesSection.java Tue Nov 28 14:21:27 2006
@@ -59,10 +59,10 @@
public ParameterDelegatesSection(MultiPageEditor editor, Composite parent) {
super(
- editor,
- parent,
- "Delegate Component Parameters",
- "This section shows all delegate components by their Key names, and what parameters they have.\nDouble-click a parameter or a group if you want to specify overrides for these parameters in this aggregate; this will add a default Configuration Parameter in this Aggregate for that parameter, and set the overrides.");
+ editor,
+ parent,
+ "Delegate Component Parameters",
+ "This section shows all delegate components by their Key names, and what parameters they have.\nDouble-click a parameter or a group if you want to specify overrides for these parameters in this aggregate; this will add a default Configuration Parameter in this Aggregate for that parameter, and set the overrides.");
}
/*
@@ -82,9 +82,9 @@
Composite buttonContainer = new2ColumnComposite(sectionClient);
((GridData) buttonContainer.getLayoutData()).grabExcessVerticalSpace = false;
createOverrideButton = newPushButton(buttonContainer, "Create Override",
- "Click here to create a new override for this parameter");
+ "Click here to create a new override for this parameter");
createNonSharedOverrideButton = newPushButton(buttonContainer, "Create non-shared Override",
- "Click here to create a non-shared override for this parameter");
+ "Click here to create a non-shared override for this parameter");
tree.addListener(SWT.MouseDoubleClick, this); // edit gesture
tree.addListener(SWT.MouseHover, this); // hover
@@ -109,8 +109,8 @@
} else {
getSection().setText("Delegate Component Parameters");
getSection()
- .setDescription(
- "This section shows all delegate components by their Key names, and what parameters they have.\nDouble-click a parameter or a group if you want to specify overrides for these parameters in this aggregate; this will add a default Configuration Parameter in this Aggregate for that parameter, and set the overrides.");
+ .setDescription(
+ "This section shows all delegate components by their Key names, and what parameters they have.\nDouble-click a parameter or a group if you want to specify overrides for these parameters in this aggregate; this will add a default Configuration Parameter in this Aggregate for that parameter, and set the overrides.");
cpd = getAnalysisEngineMetaData().getConfigurationParameterDeclarations();
for (Iterator it = editor.getResolvedDelegates().entrySet().iterator(); it.hasNext();) {
@@ -144,11 +144,11 @@
private void addDelegateToGUI(String key, ResourceSpecifier delegate) {
if (delegate instanceof AnalysisEngineDescription || delegate instanceof CasConsumerDescription
- || delegate instanceof FlowControllerDescription) {
+ || delegate instanceof FlowControllerDescription) {
TreeItem d = new TreeItem(tree, SWT.NONE);
d.setText(((delegate instanceof FlowControllerDescription) ? FLOWCTLR_HEADER
- : DELEGATE_HEADER)
- + key);
+ : DELEGATE_HEADER)
+ + key);
d.setData(key);
addDelegateGroupsToGUI(d, (ResourceCreationSpecifier) delegate);
d.setExpanded(true);
@@ -157,7 +157,7 @@
private void addDelegateGroupsToGUI(TreeItem parent, ResourceCreationSpecifier delegate) {
ConfigurationParameterDeclarations cpd1 = delegate.getMetaData()
- .getConfigurationParameterDeclarations();
+ .getConfigurationParameterDeclarations();
// if (delegate instanceof AnalysisEngineDescription)
// cpd1 = ((AnalysisEngineDescription)delegate)
// .getAnalysisEngineMetaData().getConfigurationParameterDeclarations();
@@ -255,7 +255,7 @@
private void addNewParameter(TreeItem item) {
addNewParameter(getConfigurationParameterFromTreeItem(item), getConfigGroupFromTreeItem(item
- .getParentItem()), getKeyNameFromTreeItem(item.getParentItem().getParentItem()));
+ .getParentItem()), getKeyNameFromTreeItem(item.getParentItem().getParentItem()));
}
private void addAllParameters(TreeItem[] items) {
@@ -282,10 +282,10 @@
String overrideParmName;
if (null != (overrideParmName = getOverridingParmName(override, cpd))) {
Utility.popMessage("Only one override allowed",
- "This delegate parameter already is being overridden by '" + overrideParmName
- + "'. To override "
- + "with a different parameter, first remove this override",
- MessageDialog.ERROR);
+ "This delegate parameter already is being overridden by '" + overrideParmName
+ + "'. To override "
+ + "with a different parameter, first remove this override",
+ MessageDialog.ERROR);
return;
}
if (null != (parmInGroup = getSameNamedParmInGroup(parm, group))) {
@@ -302,7 +302,7 @@
}
} else {
if (ParameterSection.parameterNameAlreadyDefinedNoMsg(parm.getName(),
- getConfigurationParameterDeclarations())) {
+ getConfigurationParameterDeclarations())) {
// parm names must be unique across this descriptor, even among different groups
String newName = generateUniqueName(parm.getName());
parmSection.addParm(newName, parm, group, override);
@@ -323,7 +323,7 @@
if (null != groups)
for (int i = 0; i < groups.length; i++) {
if (null != (result = getOverridingParmName(override, groups[i]
- .getConfigurationParameters())))
+ .getConfigurationParameters())))
return result;
}
return null;
@@ -385,7 +385,7 @@
}
private ConfigurationParameter getSameNamedParmInGroup(ConfigurationParameter parm,
- ConfigGroup group) {
+ ConfigGroup group) {
ConfigurationParameter[] cps = group.getConfigParms();
String parmName = parm.getName();
for (int i = 0; i < cps.length; i++) {
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterPage.java Tue Nov 28 14:21:27 2006
@@ -41,7 +41,7 @@
Form2Panel form2Panel = setup2ColumnLayout(managedForm, 55, 45);
managedForm.addPart(parameterSection = new ParameterSection(editor, form2Panel.left));
managedForm.addPart(parameterDelegatesSection = new ParameterDelegatesSection(editor,
- form2Panel.right));
+ form2Panel.right));
createToolBarActions(managedForm);
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSection.java Tue Nov 28 14:21:27 2006
@@ -177,7 +177,7 @@
*/
public ParameterSection(MultiPageEditor editor, Composite parent) {
super(editor, parent, "Configuration Parameters",
- "This section shows all configuration parameters defined for this engine.");
+ "This section shows all configuration parameters defined for this engine.");
}
// This page shows the configuration parameters
@@ -208,7 +208,7 @@
Composite sectionClient = newComposite(getSection());
usingGroupsButton = newCheckBox(sectionClient, "Use Parameter Groups",
- "Check this box if Groups are being used with Parameters");
+ "Check this box if Groups are being used with Parameters");
groupingControl = new2ColumnComposite(sectionClient);
((GridData) groupingControl.getLayoutData()).grabExcessVerticalSpace = false;
@@ -216,7 +216,7 @@
toolkit.paintBordersFor(groupingControl);
defaultGroup = newLabeledTextField(groupingControl, "Default Group",
- "Specify the name of the default group.");
+ "Specify the name of the default group.");
newLabelWithData(groupingControl, "SearchStrategy");
searchStrategy = newCComboWithTip(groupingControl, "SearchStrategyToolTip");
searchStrategy.add("language_fallback");
@@ -237,7 +237,7 @@
Composite buttonContainer = newButtonContainer(tableContainer);
addButton = newPushButton(buttonContainer, S_ADD, "Click here to add a new parameter");
addGroupButton = newPushButton(buttonContainer, "AddGroup",
- "Click here to add a group specification. A group specification names one or more group names.");
+ "Click here to add a group specification. A group specification names one or more group names.");
editButton = newPushButton(buttonContainer, S_EDIT, S_EDIT_TIP);
removeButton = newPushButton(buttonContainer, S_REMOVE, S_REMOVE_TIP);
@@ -260,7 +260,7 @@
cpd = getAnalysisEngineMetaData().getConfigurationParameterDeclarations();
if ((firstTime && isParmGroup()) || isAggregate()
- || (!firstTime && usingGroupsButton.getSelection())) {
+ || (!firstTime && usingGroupsButton.getSelection())) {
usingGroupsButton.setSelection(true);
groupingControl.setVisible(true);
@@ -283,7 +283,7 @@
// sync settings page to catch use case of switching from sourceEditor
// to this page after having shown settings page - may be out of date
ParameterSettingsSection settingsSection = editor.getSettingsPage()
- .getParameterSettingsSection();
+ .getParameterSettingsSection();
if (null != settingsSection) {
setSettings(settingsSection);
@@ -305,10 +305,10 @@
if (usingGroupsButton.getSelection()) {
} else {
if (Window.CANCEL == Utility
- .popOkCancel(
- "Confirm Remove Groups",
- "This action will delete any group information that may be present in this descriptor. Proceed?",
- MessageDialog.WARNING)) {
+ .popOkCancel(
+ "Confirm Remove Groups",
+ "This action will delete any group information that may be present in this descriptor. Proceed?",
+ MessageDialog.WARNING)) {
usingGroupsButton.setSelection(true);
return;
}
@@ -335,10 +335,10 @@
setFileDirty();
} else if (event.widget == addGroupButton) {
CommonInputDialog dialog = new CommonInputDialog(
- this,
- "Add Group",
- "Specify one or more unique group names, separated by 1 space character, and press OK",
- CommonInputDialog.GROUP_NAMES);
+ this,
+ "Add Group",
+ "Specify one or more unique group names, separated by 1 space character, and press OK",
+ CommonInputDialog.GROUP_NAMES);
for (;;) { // stay in loop until get "true" return from add below
// used for looping while group name set is duplicate
@@ -359,12 +359,12 @@
if (!valid) {
if (isPrimitive())
Utility.popMessage("Wrong item selected",
- "Please first select the group under which to add a parameter",
- MessageDialog.ERROR);
+ "Please first select the group under which to add a parameter",
+ MessageDialog.ERROR);
else
Utility.popMessage("Wrong item selected",
- "Please first select the parameter under which to add an override",
- MessageDialog.ERROR);
+ "Please first select the parameter under which to add an override",
+ MessageDialog.ERROR);
return;
}
@@ -393,7 +393,7 @@
TreeItem editItem = tree.getSelection()[0];
if (isParameter(editItem) && isPrimitive()) {
AddParameterDialog dialog = new AddParameterDialog(this,
- getCorrespondingModelParm(editItem));
+ getCorrespondingModelParm(editItem));
if (dialog.open() == Window.CANCEL)
return;
@@ -422,10 +422,10 @@
return; // can't change the name of these groups
CommonInputDialog dialog = new CommonInputDialog(
- this,
- "Edit group",
- "Specify one or more unique group names, separated by 1 space character, and press OK",
- CommonInputDialog.GROUP_NAMES, groupNames);
+ this,
+ "Edit group",
+ "Specify one or more unique group names, separated by 1 space character, and press OK",
+ CommonInputDialog.GROUP_NAMES, groupNames);
for (;;) {
if (dialog.open() == Window.CANCEL)
@@ -437,7 +437,7 @@
commonActionFinishDirtyIfChange();
}
} else if ((event.widget == removeButton)
- || (event.widget == tree && event.type == SWT.KeyUp && event.character == SWT.DEL)) {
+ || (event.widget == tree && event.type == SWT.KeyUp && event.character == SWT.DEL)) {
// handle remove - of all selected items
// if a group is selected, removing the group also removes all the parms in the group
@@ -475,12 +475,11 @@
// only picks one override key - but code is from earlier design where multiple keys were
// possible
PickOverrideKeysAndParmName dialog = new PickOverrideKeysAndParmName(getSection().getShell(),
- delegateMap, "Override Keys and Parameter Name Selection", cp, cpd,
- overrideIndex == -1);
+ delegateMap, "Override Keys and Parameter Name Selection", cp, cpd, overrideIndex == -1);
dialog.setTitle("Delegate Keys and Parameter Name Selection");
dialog
- .setMessage("Select the override key path from the left panel, and the overridden parameter from the right panel.\nOnly valid parameters will be shown.");
+ .setMessage("Select the override key path from the left panel, and the overridden parameter from the right panel.\nOnly valid parameters will be shown.");
if (dialog.open() == Window.CANCEL)
return;
Object[] keysAndParms = dialog.getResult();
@@ -501,7 +500,7 @@
// cloned array
valueChanged = false;
String overrideSpec = keyNames.append('/').append((String) ((Object[]) keysAndParms[1])[0])
- .toString();
+ .toString();
// updateOneOverride(cp, overrideIndex, dialog.overrideSpec);
if (overrideIndex < 0) {
addOverride(cp, overrideSpec);
@@ -530,16 +529,16 @@
if (isGroup[i]) {
if (NOT_IN_ANY_GROUP.equals(namesToRemove[i]))
msgGroup
- .append("\nThis action removes all parameter descriptions in the <Not in any group> section.");
+ .append("\nThis action removes all parameter descriptions in the <Not in any group> section.");
else {
if (i > 0)
msgGroup.append(", ");
else if (COMMON_GROUP.equals(namesToRemove[i]))
msgGroup
- .append("\nThis action removes all parameter descriptions in the <Common> section.");
+ .append("\nThis action removes all parameter descriptions in the <Common> section.");
else
msgGroup
- .append("\nGroups being removed, together with their parameter definitions defined here: \n");
+ .append("\nGroups being removed, together with their parameter definitions defined here: \n");
if (!COMMON_GROUP.equals(namesToRemove[i]))
msgGroup.append(namesToRemove[i]);
}
@@ -560,10 +559,9 @@
}
if (giveWarningMsg
- && Window.CANCEL == Utility.popOkCancel("Confirm Remove",
- "Please confirm remove, or Cancel.\n" + msgGroup.toString()
- + msg.toString() + oMsg.toString(),
- MessageDialog.WARNING))
+ && Window.CANCEL == Utility.popOkCancel("Confirm Remove",
+ "Please confirm remove, or Cancel.\n" + msgGroup.toString() + msg.toString()
+ + oMsg.toString(), MessageDialog.WARNING))
return false;
// loop thru all things being removed, and remove them
@@ -593,14 +591,14 @@
String parentGroupName = getName(parentItem.getText());
if (parentGroupName.equals(NOT_IN_ANY_GROUP))
cpd.setConfigurationParameters(removeConfigurationParameter(cpd.getConfigurationParameters(),
- nameToRemove));
+ nameToRemove));
else if (parentGroupName.equals(COMMON_GROUP))
cpd.setCommonParameters(commonParms = removeConfigurationParameter(cpd.getCommonParameters(),
- nameToRemove));
+ nameToRemove));
else {
cg = getConfigurationGroup(parentGroupName);
cg.setConfigurationParameters(removeConfigurationParameter(cg.getConfigurationParameters(),
- nameToRemove));
+ nameToRemove));
}
removeParmSettingFromMultipleGroups(itemToRemove, REMOVE_FROM_GUI);
@@ -640,7 +638,7 @@
}
public void addParm(String name, ConfigurationParameter modelParm, ConfigGroup group,
- String override) {
+ String override) {
TreeItem parentGroup = getTreeItemGroup(group);
AddParameterDialog dialog = new AddParameterDialog(this);
dialog.parmName = name;
@@ -667,13 +665,13 @@
}
private ConfigurationGroup[] removeConfigurationGroup(ConfigurationGroup[] groups,
- ConfigurationGroup cg) {
+ ConfigurationGroup cg) {
return (ConfigurationGroup[]) Utility.removeElementFromArray(groups, cg,
- ConfigurationGroup.class);
+ ConfigurationGroup.class);
}
private ConfigurationParameter[] removeConfigurationParameter(ConfigurationParameter[] parms,
- String nameToRemove) {
+ String nameToRemove) {
ConfigurationParameter[] newParms = new ConfigurationParameter[parms.length - 1];
for (int i = 0, j = 0; i < newParms.length; i++, j++) {
if (parms[j].getName().equals(nameToRemove))
@@ -745,8 +743,8 @@
// shouldn't be defined more than once
if (groupNameAlreadyDefined(newGroupNames)) {
Utility.popMessage("Group Already Defined",
- "This set of group names has already been defined." + "\n\nGroup: " + names,
- MessageDialog.ERROR);
+ "This set of group names has already been defined." + "\n\nGroup: " + names,
+ MessageDialog.ERROR);
return false;
}
@@ -878,7 +876,7 @@
}
private void alterExistingConfigurationParameter(AddParameterDialog dialog,
- TreeItem existingTreeItem) {
+ TreeItem existingTreeItem) {
ConfigurationParameter existingCP = getCorrespondingModelParm(existingTreeItem);
ConfigurationParameter previousCP = existingCP;
previousCP = (ConfigurationParameter) previousCP.clone();
@@ -895,7 +893,7 @@
// If the name changes, change existing settings for that parm name in all groups
if ((!previousCP.getType().equals(existingCP.getType()))
- || (previousCP.isMultiValued() != existingCP.isMultiValued())) {
+ || (previousCP.isMultiValued() != existingCP.isMultiValued())) {
removeParmSettingFromMultipleGroups(existingTreeItem, !REMOVE_FROM_GUI);
}
@@ -903,7 +901,7 @@
}
private void commonParmUpdate(TreeItem existingTreeItem, ConfigurationParameter existingCP,
- String prevName) {
+ String prevName) {
updateParmInSettingsGUI(existingCP, existingTreeItem, prevName);
String newName = existingCP.getName();
@@ -913,7 +911,7 @@
String[] allGroupNames = new String[] { null };
if (usingGroupsButton.getSelection()) {
allGroupNames = (String[]) Utility
- .addElementToArray(getAllGroupNames(), null, String.class);
+ .addElementToArray(getAllGroupNames(), null, String.class);
}
Object value;
@@ -937,11 +935,10 @@
valueChanged = false;
existingCP.setName(setValueChanged(dialog.parmName, existingCP.getName()));
existingCP.setDescription(setValueChanged(multiLineFix(dialog.description), existingCP
- .getDescription()));
+ .getDescription()));
existingCP.setMandatory(setValueChangedBoolean(dialog.mandatory, existingCP.isMandatory()));
existingCP
- .setMultiValued(setValueChangedBoolean(dialog.multiValue, existingCP
- .isMultiValued()));
+ .setMultiValued(setValueChangedBoolean(dialog.multiValue, existingCP.isMultiValued()));
existingCP.setType(setValueChanged(dialog.parmType, existingCP.getType()));
if (valueChanged)
setFileDirty();
@@ -956,7 +953,7 @@
* @return
*/
private ConfigurationParameter addNewConfigurationParameter(AddParameterDialog dialog,
- TreeItem group) {
+ TreeItem group) {
ConfigurationParameter newCP = new ConfigurationParameter_impl();
fillModelParm(dialog, newCP);
@@ -1000,7 +997,7 @@
}
private ConfigurationParameter[] addParmToArray(ConfigurationParameter[] cps,
- ConfigurationParameter newCP) {
+ ConfigurationParameter newCP) {
if (null == cps) {
return new ConfigurationParameter[] { newCP };
@@ -1028,7 +1025,7 @@
}
public static boolean parameterNameAlreadyDefinedNoMsg(String name,
- ConfigurationParameterDeclarations pCpd) {
+ ConfigurationParameterDeclarations pCpd) {
if (pCpd.getCommonParameters() != null) {
if (parameterInArray(name, pCpd.getCommonParameters()))
return true;
@@ -1051,8 +1048,8 @@
boolean alreadyDefined = parameterNameAlreadyDefinedNoMsg(name, cpd);
if (alreadyDefined) {
Utility.popMessage("Parameter Already Defined",
- "The following parameter is already defined in the list. Parameter names must be unique."
- + "\n\nParameter: " + name, MessageDialog.ERROR);
+ "The following parameter is already defined in the list. Parameter names must be unique."
+ + "\n\nParameter: " + name, MessageDialog.ERROR);
}
return alreadyDefined;
}
@@ -1088,18 +1085,17 @@
groupingControl.setVisible(usingGroups);
addButton.setEnabled(isPrimitive() || tree.getSelectionCount() == 1
- && (isParmSelection() || isOverrideSelection()));
+ && (isParmSelection() || isOverrideSelection()));
addGroupButton.setEnabled(isPrimitive() && usingGroups);
removeButton.setEnabled(tree.getSelectionCount() == 1
- && (isParmSelection() || isGroupSelection() || isOverrideSelection()));
+ && (isParmSelection() || isGroupSelection() || isOverrideSelection()));
editButton
- .setEnabled(tree.getSelectionCount() == 1
- && ((/* isPrimitive() && */isParmSelection())
- || isOverrideSelection() || (isPrimitive()
- && isGroupSelection() && !isCommonGroupSelection())));
+ .setEnabled(tree.getSelectionCount() == 1
+ && ((/* isPrimitive() && */isParmSelection()) || isOverrideSelection() || (isPrimitive()
+ && isGroupSelection() && !isCommonGroupSelection())));
}
public Tree getTree() {
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ParameterSettingsSection.java Tue Nov 28 14:21:27 2006
@@ -41,10 +41,10 @@
public ParameterSettingsSection(MultiPageEditor editor, Composite parent) {
super(
- editor,
- parent,
- "Configuration Parameters",
- "This section list all configuration parameters, either as plain parameters, or as part of one or more groups. Select one to show, or set the value in the right hand panel.");
+ editor,
+ parent,
+ "Configuration Parameters",
+ "This section list all configuration parameters, either as plain parameters, or as part of one or more groups. Select one to show, or set the value in the right hand panel.");
}
/*
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PrimitiveSection.java Tue Nov 28 14:21:27 2006
@@ -68,7 +68,7 @@
*/
public PrimitiveSection(MultiPageEditor editor, Composite parent) {
super(editor, parent, "Runtime Information",
- "This section describes information about how to run this component");
+ "This section describes information about how to run this component");
}
public void initialize(IManagedForm form) {
@@ -78,18 +78,18 @@
enableBorders(sectionClient);
modifiesCas = newCheckBox(sectionClient, "updates the CAS",
- "check this if this component updates the CAS");
+ "check this if this component updates the CAS");
spacer(sectionClient);
if (isAeDescriptor() || isCasConsumerDescriptor() || isFlowControllerDescriptor()) {
multipleDeploymentAllowed = newCheckBox(sectionClient, "multiple deployment allowed",
- "check this to allow multiple instances of this engine to be deployed that can run in parallel");
+ "check this to allow multiple instances of this engine to be deployed that can run in parallel");
spacer(sectionClient);
}
if (isAeDescriptor()) {
outputsNewCASes = newCheckBox(sectionClient, "Outputs new CASes",
- "check this for primitive components that output new CASes, "
- + "or for aggregates which contain a CAS Multiplier, "
- + "where the new CASes are returned out of the aggregate.");
+ "check this for primitive components that output new CASes, "
+ + "or for aggregates which contain a CAS Multiplier, "
+ + "where the new CASes are returned out of the aggregate.");
spacer(sectionClient);
}
@@ -172,11 +172,10 @@
} else {
SelectionDialog typeDialog = JavaUI.createTypeDialog(getSection().getShell(), editor
- .getEditorSite().getWorkbenchWindow(), editor
- .getSearchScopeForDescriptorType(),
- IJavaElementSearchConstants.CONSIDER_CLASSES, false, "*");
+ .getEditorSite().getWorkbenchWindow(), editor.getSearchScopeForDescriptorType(),
+ IJavaElementSearchConstants.CONSIDER_CLASSES, false, "*");
typeDialog.setTitle(MessageFormat.format("Choose the {0} implementation class",
- new Object[] { editor.descriptorTypeString() }));
+ new Object[] { editor.descriptorTypeString() }));
typeDialog.setMessage("Filter/mask:");
if (typeDialog.open() == Window.CANCEL)
return;
@@ -196,14 +195,14 @@
ops.setModifiesCas(setValueChangedBoolean(modifiesCas.getSelection(), ops.getModifiesCas()));
} else if (event.widget == multipleDeploymentAllowed) {
ops.setMultipleDeploymentAllowed(setValueChangedBoolean(multipleDeploymentAllowed
- .getSelection(), ops.isMultipleDeploymentAllowed()));
+ .getSelection(), ops.isMultipleDeploymentAllowed()));
} else if (event.widget == outputsNewCASes) {
ops.setOutputsNewCASes(setValueChangedBoolean(outputsNewCASes.getSelection(), ops
- .getOutputsNewCASes()));
+ .getOutputsNewCASes()));
} else if (event.widget == implName) {
editor.getAeDescription().setAnnotatorImplementationName(
- setValueChanged(implName.getText(), editor.getAeDescription()
- .getAnnotatorImplementationName()));
+ setValueChanged(implName.getText(), editor.getAeDescription()
+ .getAnnotatorImplementationName()));
}
if (valueChanged)
editor.setFileDirty();
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/PriorityListSection.java Tue Nov 28 14:21:27 2006
@@ -69,14 +69,14 @@
final Composite buttonContainer = newButtonContainer(sectionClient);
addSetButton = newPushButton(buttonContainer, "Add Set",
- "Click here to add another priority list.");
+ "Click here to add another priority list.");
addButton = newPushButton(buttonContainer, S_ADD, "Click here to add a type");
removeButton = newPushButton(buttonContainer, S_REMOVE, S_REMOVE_TIP);
new Button(buttonContainer, SWT.PUSH).setVisible(false); // spacer
upButton = newPushButton(buttonContainer, S_UP,
- "Click here to move the selected item up in the priority order.");
+ "Click here to move the selected item up in the priority order.");
downButton = newPushButton(buttonContainer, S_DOWN,
- "Click here to move the selected item down in the priority order");
+ "Click here to move the selected item down in the priority order");
exportButton = newPushButton(buttonContainer, S_EXPORT, S_EXPORT_TIP);
toolkit.paintBordersFor(sectionClient);
@@ -118,14 +118,14 @@
public TypePriorityList getTypePriorityListFromTreeItem(TreeItem item) {
TypePriorityList[] typePriorityLists = getAnalysisEngineMetaData().getTypePriorities()
- .getPriorityLists();
+ .getPriorityLists();
return typePriorityLists[tree.indexOf(item)];
}
public void handleEvent(Event event) {
if (event.widget == addSetButton) {
TypePriorityList typePriorityList = UIMAFramework.getResourceSpecifierFactory()
- .createTypePriorityList();
+ .createTypePriorityList();
TypePriorities typePriorities = getTypePriorities();
if (typePriorities == null) {
@@ -143,18 +143,18 @@
} else if (event.widget == addButton) { // add type to set
if (editor.isTypePriorityDescriptor() && !editor.getIsContextLoaded()) {
Utility
- .popMessage(
- "Can''t add types here",
- "Types cannot be added here, because there is no loaded context type system to pick the types from",
- MessageDialog.WARNING);
+ .popMessage(
+ "Can''t add types here",
+ "Types cannot be added here, because there is no loaded context type system to pick the types from",
+ MessageDialog.WARNING);
return;
}
TreeItem parent = tree.getSelection()[0];
if (null != parent.getParentItem())
parent = parent.getParentItem();
AddTypeToPriorityListDialog dialog = new AddTypeToPriorityListDialog(this,
- editor.definedTypesWithSupers.get(), // types
- getTypePriorityListFromTreeItem(parent).getTypes()); // types already in list
+ editor.definedTypesWithSupers.get(), // types
+ getTypePriorityListFromTreeItem(parent).getTypes()); // types already in list
if (dialog.open() == Window.CANCEL)
return;
@@ -175,11 +175,11 @@
if (null == parent) { // removing a priority set
if (Window.CANCEL == Utility.popOkCancel("ConfirmRemove", "ConfirmRemoveSet",
- MessageDialog.WARNING))
+ MessageDialog.WARNING))
return;
TypePriorityList removedTypePriorityList = getTypePriorityListFromTreeItem(item);
TypePriorityList[] oldPriorityLists = getAnalysisEngineMetaData().getTypePriorities()
- .getPriorityLists();
+ .getPriorityLists();
TypePriorityList[] newPriorityLists = new TypePriorityList[oldPriorityLists.length - 1];
for (int i = 0, j = 0; i < oldPriorityLists.length; i++) {
@@ -192,14 +192,14 @@
} else { // removing a type
if (Window.CANCEL == Utility.popOkCancel("ConfirmRemove", "ConfirmRemoveType",
- MessageDialog.WARNING))
+ MessageDialog.WARNING))
return;
TypePriorityList typePriorityList = getTypePriorityListFromTreeItem(parent);
typePriorityList.removeType(item.getText());
}
TreeItem previousSelection = getPreviousSelection(parent == null ? tree.getItems() : parent
- .getItems(), item);
+ .getItems(), item);
if (null != previousSelection)
tree.setSelection(new TreeItem[] { previousSelection });
item.dispose();
@@ -246,7 +246,7 @@
getTypePriorities().setPriorityLists(tpl);
} else if (event.widget == exportButton) {
typePriorityImportSection.exportImportablePart("<typePriorities>",
- TypePrioritiesNewWizard.TYPEPRIORITIES_TEMPLATE);
+ TypePrioritiesNewWizard.TYPEPRIORITIES_TEMPLATE);
refresh();
}
enable();
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourceDependencySection.java Tue Nov 28 14:21:27 2006
@@ -66,7 +66,7 @@
public ResourceDependencySection(MultiPageEditor editor, Composite parent) {
super(editor, parent, "Resource Dependencies",
- "Primitives declare what resources they need. A primitive can only bind to one external resource.");
+ "Primitives declare what resources they need. A primitive can only bind to one external resource.");
}
public void initialize(IManagedForm form) {
@@ -125,15 +125,15 @@
addPrimitiveToGUI(keys + newKey + "/", aeDescription);
else {
for (Iterator it = editor.getDelegateAEdescriptions(aeDescription).entrySet().iterator(); it
- .hasNext();) {
+ .hasNext();) {
Map.Entry item = (Map.Entry) it.next();
addDelegateToGUI(keys + newKey + "/", (String) item.getKey(), (ResourceSpecifier) item
- .getValue());
+ .getValue());
}
FlowControllerDeclaration fcd = getFlowControllerDeclaration();
if (null != fcd) {
addPrimitiveToGUI(keys + fcd.getKey() + "/", ((ResourceCreationSpecifier) editor
- .getResolvedFlowControllerDeclaration().getSpecifier()));
+ .getResolvedFlowControllerDeclaration().getSpecifier()));
}
}
}
@@ -159,7 +159,7 @@
private boolean isBound(String key) {
ExternalResourceBinding[] xrb = editor.getResolvedExternalResourcesAndBindings()
- .getExternalResourceBindings();
+ .getExternalResourceBindings();
if (null != xrb)
for (int i = 0; i < xrb.length; i++) {
if (key.equals(xrb[i].getKey()))
@@ -200,7 +200,7 @@
if (event.widget == addButton) {
handleAdd();
} else if (event.widget == removeButton
- || (event.type == SWT.KeyUp && event.character == SWT.DEL)) {
+ || (event.type == SWT.KeyUp && event.character == SWT.DEL)) {
handleRemove();
} else if (event.widget == editButton || event.type == SWT.MouseDoubleClick) {
handleEdit();
@@ -258,10 +258,9 @@
private void handleRemove() {
TableItem item = table.getSelection()[0];
editor.getAeDescription().setExternalResourceDependencies(
- (ExternalResourceDependency[]) Utility.removeElementFromArray(
- getExternalResourceDependencies(),
- getXRDependencyFromTableItem(item),
- ExternalResourceDependency.class));
+ (ExternalResourceDependency[]) Utility.removeElementFromArray(
+ getExternalResourceDependencies(), getXRDependencyFromTableItem(item),
+ ExternalResourceDependency.class));
table.setSelection(table.getSelectionIndices()[0] - 1);
item.dispose();
@@ -283,7 +282,7 @@
}
private void alterExistingExternalResourceDependency(ExternalResourceDependency xrd,
- AddExternalResourceDependencyDialog dialog) {
+ AddExternalResourceDependencyDialog dialog) {
valueChanged = false;
String oldKey = xrd.getKey();
xrd.setKey(setValueChanged(dialog.keyName, xrd.getKey()));
@@ -300,7 +299,7 @@
}
private ExternalResourceDependency addNewExternalResourceDependency(
- AddExternalResourceDependencyDialog dialog) {
+ AddExternalResourceDependencyDialog dialog) {
ExternalResourceDependency[] xrds = getExternalResourceDependencies();
ExternalResourceDependency xrd = new ExternalResourceDependency_impl();
@@ -308,7 +307,7 @@
if (null == xrds)
editor.getAeDescription().setExternalResourceDependencies(
- new ExternalResourceDependency[] { xrd });
+ new ExternalResourceDependency[] { xrd });
else {
ExternalResourceDependency[] newXrds = new ExternalResourceDependency[xrds.length + 1];
System.arraycopy(xrds, 0, newXrds, 0, xrds.length);
@@ -338,13 +337,12 @@
for (int i = 0; i < xrds.length; i++) {
if (key.equals(xrds[i].getKey())) {
Utility
- .popMessage(
- "Key Already Defined",
- MessageFormat
- .format(
- "The key name you specified, ''{0}'', is already defined. Please pick a different key name.",
- new String[] { key }),
- MessageDialog.ERROR);
+ .popMessage(
+ "Key Already Defined",
+ MessageFormat
+ .format(
+ "The key name you specified, ''{0}'', is already defined. Please pick a different key name.",
+ new String[] { key }), MessageDialog.ERROR);
return true;
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ResourcesPage.java Tue Nov 28 14:21:27 2006
@@ -54,7 +54,7 @@
managedForm.addPart(extnlResBindSection = new ExtnlResBindSection(editor, form2panel.left));
managedForm.addPart(resBindImportSection = new ImportResBindSection(editor, form2panel.left));
managedForm.addPart(resourceDependencySection = new ResourceDependencySection(editor,
- form2panel.right));
+ form2panel.right));
createToolBarActions(managedForm);
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SettingsPage.java Tue Nov 28 14:21:27 2006
@@ -42,7 +42,7 @@
managedForm.getForm().setText("Parameter Settings");
managedForm.addPart(parameterSettingsSection = new ParameterSettingsSection(editor,
- form2Panel.left));
+ form2Panel.left));
managedForm.addPart(valueSection = new ValueSection(editor, form2Panel.right));
createToolBarActions(managedForm);
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/SofaMapSection.java Tue Nov 28 14:21:27 2006
@@ -68,7 +68,7 @@
private static final boolean OUTPUT = false;
private static final String titleMsg = "This section shows all defined Sofas for an Aggregate and their mappings to the component Sofas.\n"
- + "Add Aggregate Sofa Names using the Capabilities section; Select an Aggregate Sofa Name and Add/Edit mappings for that Sofa in this section.\n";
+ + "Add Aggregate Sofa Names using the Capabilities section; Select an Aggregate Sofa Name and Add/Edit mappings for that Sofa in this section.\n";
public SofaMapSection(MultiPageEditor aEditor, Composite parent) {
super(aEditor, parent, "Sofa Mappings (Only used in aggregate Descriptors)", titleMsg);
@@ -149,7 +149,7 @@
for (int i = 0; i < allMappings.length; i++) {
String sofaName = allMappings[i].getAggregateSofaName();
if (0 > Arrays.binarySearch(inputCapabilityNames, sofaName)
- && 0 > Arrays.binarySearch(outputCapabilityNames, sofaName))
+ && 0 > Arrays.binarySearch(outputCapabilityNames, sofaName))
undeclaredNames.add(sofaName);
}
}
@@ -194,7 +194,7 @@
SofaMapping sofaMapping = sofaMappings[i];
if (sofaMapping.getAggregateSofaName().equals(aggrSofa))
if (null != sofaMapping.getComponentSofaName()
- && !"".equals(sofaMapping.getComponentSofaName()))
+ && !"".equals(sofaMapping.getComponentSofaName()))
bindings.add(sofaMapping.getComponentKey() + '/' + sofaMapping.getComponentSofaName());
else
bindings.add(sofaMapping.getComponentKey());
@@ -260,10 +260,10 @@
Map availAndBoundSofas = getAvailAndBoundSofas(aggrSofa, !AVAIL_ONLY);
if (availAndBoundSofas.size() == 0) {
Utility
- .popMessage(
- "No available sofas",
- "Because there are no sofas in the delegates that are not already bound, no sofa mapping can be created.",
- MessageDialog.WARNING);
+ .popMessage(
+ "No available sofas",
+ "Because there are no sofas in the delegates that are not already bound, no sofa mapping can be created.",
+ MessageDialog.WARNING);
return;
}
@@ -287,10 +287,10 @@
Map availAndBoundSofas = getAvailAndBoundSofas(aggrSofa, AVAIL_ONLY);
if (availAndBoundSofas.size() == 0) {
Utility
- .popMessage(
- "No available sofas",
- "Because there are no sofas in the delegates that are not already bound, no sofa mapping can be created.",
- MessageDialog.WARNING);
+ .popMessage(
+ "No available sofas",
+ "Because there are no sofas in the delegates that are not already bound, no sofa mapping can be created.",
+ MessageDialog.WARNING);
return;
}
@@ -305,10 +305,10 @@
}
private void addSofasToAllComponentSofaMap(Map allComponentSofas, String key,
- ResourceSpecifier delegate, boolean isInput) {
+ ResourceSpecifier delegate, boolean isInput) {
// delegates can be AnalysisEngines, CasConsmers, flowControllers, or remotes
if (delegate instanceof AnalysisEngineDescription || delegate instanceof CasConsumerDescription
- || delegate instanceof FlowControllerDescription) {
+ || delegate instanceof FlowControllerDescription) {
Set[] inAndOut = getCapabilitySofaNames((ResourceCreationSpecifier) delegate, key);
Set inOut = inAndOut[isInput ? 0 : 1];
if (!isInput) { // Aggr "output" can be mapped to delegate "input"
@@ -338,7 +338,7 @@
for (Iterator it = editor.getResolvedDelegates().entrySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next();
addSofasToAllComponentSofaMap(allComponentSofas, (String) entry.getKey(),
- (ResourceSpecifier) entry.getValue(), isInput);
+ (ResourceSpecifier) entry.getValue(), isInput);
}
// pick up any sofa info from flow controller
FlowControllerDeclaration fcd = editor.getResolvedFlowControllerDeclaration();
@@ -410,16 +410,16 @@
}
};
editor.getAeDescription().setSofaMappings(
- (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(), aggrSofa,
- SofaMapping.class, comparator));
+ (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(), aggrSofa,
+ SofaMapping.class, comparator));
}
private void removeAggr(TreeItem selected) {
if (Window.CANCEL == Utility
- .popOkCancel(
- "Confirm delete of sofa mappings",
- "Please confirm deletion of all sofa mappings for this Aggregate Sofa name. Note this will not delete the Sofa name. To do that, remove the name from the Component Capabilities panel (the other panel on this page).",
- MessageDialog.WARNING))
+ .popOkCancel(
+ "Confirm delete of sofa mappings",
+ "Please confirm deletion of all sofa mappings for this Aggregate Sofa name. Note this will not delete the Sofa name. To do that, remove the name from the Component Capabilities panel (the other panel on this page).",
+ MessageDialog.WARNING))
return;
removeAggr(selected.getText());
removeChildren(selected);
@@ -444,7 +444,7 @@
String sofa = getSofaOnly((String) componentAndSofa);
if (null == sofa || sofa.equals(""))
if (null == sofaMapping.getComponentSofaName()
- || "".equals(sofaMapping.getComponentSofaName()))
+ || "".equals(sofaMapping.getComponentSofaName()))
return 0;
else
return -1;
@@ -456,8 +456,8 @@
};
editor.getAeDescription().setSofaMappings(
- (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(), selected
- .getText(), SofaMapping.class, comparator));
+ (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(), selected.getText(),
+ SofaMapping.class, comparator));
selected.dispose();
setFileDirty();
}
@@ -469,7 +469,7 @@
* @param componentSofa
*/
public static void removeSofaMappings(String componentKey, ResourceSpecifier delegate,
- MultiPageEditor pEditor) {
+ MultiPageEditor pEditor) {
if (delegate instanceof AnalysisEngineDescription || delegate instanceof CasConsumerDescription) {
Set[] inOut = getCapabilitySofaNames((ResourceCreationSpecifier) delegate, componentKey);
inOut[0].addAll(inOut[1]);
@@ -488,8 +488,8 @@
};
pEditor.getAeDescription().setSofaMappings(
- (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(pEditor),
- null, SofaMapping.class, comparator));
+ (SofaMapping[]) Utility.removeElementsFromArray(getSofaMappings(pEditor), null,
+ SofaMapping.class, comparator));
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java Tue Nov 28 14:21:27 2006
@@ -43,7 +43,7 @@
public TypeImportSection(MultiPageEditor editor, Composite parent) {
super(editor, parent, "Imported Type Systems",
- "The following type systems are included as part of this one.");
+ "The following type systems are included as part of this one.");
}
// **************************************
@@ -63,7 +63,7 @@
protected String getDescriptionFromImport(String source) throws InvalidXMLException, IOException {
TypeSystemDescription parsedImportItem = UIMAFramework.getXMLParser()
- .parseTypeSystemDescription(new XMLInputSource(source));
+ .parseTypeSystemDescription(new XMLInputSource(source));
return parsedImportItem.getDescription();
}
@@ -97,13 +97,11 @@
return false;
}
if (importWasRemoved)
- if (Window.CANCEL == Utility
- .popOkCancel(
- "May need to remove dependencies",
- "A type import is being removed. If this would removed some types or features in the"
- + " merged type system, which are referenced in the Capabilities or Indexes "
- + "section, you will need to update those sections as appropriate.",
- MessageDialog.INFORMATION)) {
+ if (Window.CANCEL == Utility.popOkCancel("May need to remove dependencies",
+ "A type import is being removed. If this would removed some types or features in the"
+ + " merged type system, which are referenced in the Capabilities or Indexes "
+ + "section, you will need to update those sections as appropriate.",
+ MessageDialog.INFORMATION)) {
revertMsg(title, msg, "Cancelled by user.");
editor.setMergedTypeSystemDescription(savedTSD);
editor.setImportedTypeSystemDescription(savedITSD);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java Tue Nov 28 14:21:27 2006
@@ -37,7 +37,7 @@
public TypePriorityImportSection(MultiPageEditor editor, Composite parent) {
super(editor, parent, "Type Priority Imports",
- "The following type priority imports are included as part of the type priorities:");
+ "The following type priority imports are included as part of the type priorities:");
}
// **************************************
@@ -52,7 +52,7 @@
*/
protected String getDescriptionFromImport(String source) throws InvalidXMLException, IOException {
TypePriorities parsedImportItem = UIMAFramework.getXMLParser().parseTypePriorities(
- new XMLInputSource(source));
+ new XMLInputSource(source));
return parsedImportItem.getDescription();
}
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java Tue Nov 28 14:21:27 2006
@@ -82,8 +82,8 @@
public class TypeSection extends AbstractImportablePartSection {
public static final String CASCADE_MESSAGE = "This will cause a cascading deletion of an associated "
- + "input, output, index, or type priority, unless this deletion exposes a "
- + "built-in or imported type or feature of the same name. Ok to continue?";
+ + "input, output, index, or type priority, unless this deletion exposes a "
+ + "built-in or imported type or feature of the same name. Ok to continue?";
public static final String CASCADE_DELETE_WARNING = "Cascade Delete Warning";
@@ -121,10 +121,10 @@
public TypeSection(MultiPageEditor editor, Composite parent) {
super(
- editor,
- parent,
- "Types (or Classes)",
- "The following types (classes) are defined in this analysis engine descriptor.\nThe grayed out items are imported or merged from other descriptors, and cannot be edited here. (To edit them, edit their source files).");
+ editor,
+ parent,
+ "Types (or Classes)",
+ "The following types (classes) are defined in this analysis engine descriptor.\nThe grayed out items are imported or merged from other descriptors, and cannot be edited here. (To edit them, edit their source files).");
}
// **********************************************************************
@@ -153,14 +153,14 @@
Composite buttonContainer = newButtonContainer(sectionClient);
addTypeButton = newPushButton(buttonContainer, "Add Type", "Click here to add a new type.");
addButton = newPushButton(buttonContainer, S_ADD,
- "Click here to add a feature or allowed-value to the selected type.");
+ "Click here to add a feature or allowed-value to the selected type.");
editButton = newPushButton(buttonContainer, S_EDIT, S_EDIT_TIP);
removeButton = newPushButton(buttonContainer, S_REMOVE, S_REMOVE_TIP);
exportButton = newPushButton(buttonContainer, S_EXPORT, S_EXPORT_TIP);
spacer(buttonContainer);
jcasGenButton = newPushButton(buttonContainer, "JCasGen",
- "Click here to run JCasGen on this type system.");
+ "Click here to run JCasGen on this type system.");
}
/*
@@ -219,7 +219,7 @@
TypeDescription builtInTd = getBuiltInTypeDescription(td);
if (null != builtInTd) {
FeatureDescription[] additionalBuiltInFeatures = setDifference(builtInTd.getFeatures(), td
- .getFeatures());
+ .getFeatures());
addFeaturesToGui(td, item, additionalBuiltInFeatures);
}
@@ -238,7 +238,7 @@
}
private void addFeaturesToGui(TypeDescription td, TableTreeItem item,
- FeatureDescription[] features) {
+ FeatureDescription[] features) {
if (null != features) {
for (int i = 0; i < features.length; i++) {
TableTreeItem fItem = new TableTreeItem(item, SWT.NONE);
@@ -255,20 +255,17 @@
setItemColor(fItem, null != getLocalFeatureDefinition(td, fd));
if (isArrayOrListType(rangeType)) {
Boolean mra = fd.getMultipleReferencesAllowed();
- fItem
- .setImage(
- MULTIPLE_REF_OK_COL,
- (null != mra && mra.booleanValue()) ? TAEConfiguratorPlugin
- .getImage(TAEConfiguratorPlugin.IMAGE_MREFOK)
- : TAEConfiguratorPlugin
- .getImage(TAEConfiguratorPlugin.IMAGE_NOMREF));
+ fItem.setImage(MULTIPLE_REF_OK_COL,
+ (null != mra && mra.booleanValue()) ? TAEConfiguratorPlugin
+ .getImage(TAEConfiguratorPlugin.IMAGE_MREFOK) : TAEConfiguratorPlugin
+ .getImage(TAEConfiguratorPlugin.IMAGE_NOMREF));
} else {
fItem.setImage(MULTIPLE_REF_OK_COL, null);
}
String ert = fd.getElementType();
fItem.setText(ELEMENT_TYPE_COL,
- (isFSArrayOrListType(rangeType) && ert != null) ? formatName(ert) : "");
+ (isFSArrayOrListType(rangeType) && ert != null) ? formatName(ert) : "");
}
@@ -299,13 +296,13 @@
} else if (event.widget == editButton) {
handleEdit();
} else if (event.type == SWT.MouseDoubleClick && (!isAggregate()) && // can't edit aggregates
- isLocalItem(tt.getSelection()[0])) {
+ isLocalItem(tt.getSelection()[0])) {
handleEdit();
} else if (event.widget == removeButton) {
handleRemove();
} else if (event.widget == exportButton) {
editor.getTypePage().getTypeImportSection().exportImportablePart("<typeSystemDescription>",
- TypeSystemNewWizard.TYPESYSTEM_TEMPLATE);
+ TypeSystemNewWizard.TYPESYSTEM_TEMPLATE);
refresh();
} else if (event.widget == jcasGenButton) {
editor.doJCasGenChkSrc(null);
@@ -328,10 +325,10 @@
} else if (o instanceof FeatureDescription) {
FeatureDescription fd = (FeatureDescription) o;
if (item.getBounds(MULTIPLE_REF_OK_COL).contains(event.x, event.y)
- && isArrayOrListType(fd.getRangeTypeName())) {
+ && isArrayOrListType(fd.getRangeTypeName())) {
Boolean mra = fd.getMultipleReferencesAllowed();
setToolTipText(tt, (mra != null && mra.booleanValue()) ? "Multiple References Allowed"
- : "Multiple References Not Allowed");
+ : "Multiple References Not Allowed");
} else
setToolTipText(tt, fd.getDescription());
} else if (o instanceof AllowedValue) {
@@ -385,7 +382,7 @@
private void addAllowedValue(TypeDescription td, AllowedValue av) {
td.setAllowedValues((AllowedValue[]) Utility.addElementToArray(td.getAllowedValues(), av,
- AllowedValue.class));
+ AllowedValue.class));
}
/**
@@ -396,7 +393,7 @@
*/
private void removeAllowedValue(TypeDescription td, AllowedValue av) {
td.setAllowedValues((AllowedValue[]) Utility.removeEqualElementFromArray(td.getAllowedValues(),
- av, AllowedValue.class));
+ av, AllowedValue.class));
}
// disabled unless type is selected
@@ -490,7 +487,7 @@
TypeSystemDescription localTsd = getTypeSystemDescription();
TypeDescription td = localTsd.addType(dialog.typeName, multiLineFix(dialog.description),
- dialog.supertypeName);
+ dialog.supertypeName);
if (!isImportedType(dialog.typeName)) {
td = tsd.addType(dialog.typeName, multiLineFix(dialog.description), dialog.supertypeName);
@@ -557,29 +554,29 @@
if (!dialog.featureName.equals(oldFeatureName)) {
if (isImportedFeature(oldFeatureName, td)) {
Utility
- .popMessage(
- "Imported Feature not changed",
- "Changing the feature name from '"
- + oldFeatureName
- + "' to '"
- + dialog.featureName
- + "' will not affect the corresponding imported type with the previous feature name. "
- + "Both features will be included in the type.",
- MessageDialog.INFORMATION);
+ .popMessage(
+ "Imported Feature not changed",
+ "Changing the feature name from '"
+ + oldFeatureName
+ + "' to '"
+ + dialog.featureName
+ + "' will not affect the corresponding imported type with the previous feature name. "
+ + "Both features will be included in the type.",
+ MessageDialog.INFORMATION);
remergeNeeded = true;
refreshNeeded = true;
}
if (isBuiltInFeature(oldFeatureName, td)) {
Utility
- .popMessage(
- "BuiltIn Feature not changed",
- "Changing the feature name from '"
- + oldFeatureName
- + "' to '"
- + dialog.featureName
- + "' will not affect the corresponding built-in type with the previous feature name. "
- + "Both features will be included in the type.",
- MessageDialog.INFORMATION);
+ .popMessage(
+ "BuiltIn Feature not changed",
+ "Changing the feature name from '"
+ + oldFeatureName
+ + "' to '"
+ + dialog.featureName
+ + "' will not affect the corresponding built-in type with the previous feature name. "
+ + "Both features will be included in the type.",
+ MessageDialog.INFORMATION);
refreshNeeded = true; // no remerge needed - builtins not merged
}
}
@@ -709,25 +706,25 @@
return;
if (isImportedType(oldTypeName)
- && MessageDialog.CANCEL == Utility
- .popOkCancel(
- "Type define via Import",
- "The type '"
- + oldTypeName
- + "' is also defined in 1 or more imports. Changing the type name here will not change it in the imported type file, causing both types to be in the type system, together. Please confirm this is what you intend.",
- MessageDialog.WARNING))
+ && MessageDialog.CANCEL == Utility
+ .popOkCancel(
+ "Type define via Import",
+ "The type '"
+ + oldTypeName
+ + "' is also defined in 1 or more imports. Changing the type name here will not change it in the imported type file, causing both types to be in the type system, together. Please confirm this is what you intend.",
+ MessageDialog.WARNING))
return;
if (isBuiltInType(oldTypeName)
- && MessageDialog.CANCEL == Utility
- .popOkCancel(
- "Type was extending a built-in",
- "The type '"
- + oldTypeName
- + "' was extending a builtin type of the same name. Changing the type name here will not change the built-in type, causing both types to be in the type system, together. Please confirm this is what you intend.",
- MessageDialog.WARNING))
+ && MessageDialog.CANCEL == Utility
+ .popOkCancel(
+ "Type was extending a built-in",
+ "The type '"
+ + oldTypeName
+ + "' was extending a builtin type of the same name. Changing the type name here will not change the built-in type, causing both types to be in the type system, together. Please confirm this is what you intend.",
+ MessageDialog.WARNING))
return;
if (isImportedType(oldTypeName) || isImportedType(newTypeName) || isBuiltInType(oldTypeName)
- || isBuiltInType(newTypeName))
+ || isBuiltInType(newTypeName))
mergeAndRefreshNeeded = true;
}
valueChanged = false;
@@ -841,7 +838,7 @@
String sCascadeDeleteTitle = CASCADE_DELETE_WARNING;
String sCascadeDeleteMessage = CASCADE_MESSAGE;
boolean bContinue = MessageDialog.openConfirm(getSection().getShell(), sCascadeDeleteTitle,
- sCascadeDeleteMessage);
+ sCascadeDeleteMessage);
if (!bContinue)
return;
}
@@ -863,7 +860,7 @@
}
if (bFeatureInUseElsewhere && !isImportedFeature(featureName, td)
- && !isBuiltInFeature(featureName, td)) {
+ && !isBuiltInFeature(featureName, td)) {
deleteTypeOrFeatureMentions(featureName, FEATURES, localTd.getName());
}
@@ -955,7 +952,7 @@
String sCascadeDeleteTitle = CASCADE_DELETE_WARNING;
String sCascadeDeleteMessage = CASCADE_MESSAGE;
boolean bContinue = MessageDialog.openConfirm(getSection().getShell(), sCascadeDeleteTitle,
- sCascadeDeleteMessage);
+ sCascadeDeleteMessage);
if (!bContinue) {
return;
}
@@ -978,7 +975,7 @@
}
TypeFeature[] featuresToRemove = computeFeaturesToRemove(localTd,
- getMergedTypeSystemDescription().getType(td.getName()));
+ getMergedTypeSystemDescription().getType(td.getName()));
if (bTypeInUseElsewhere && !isImportedType(td) && !isBuiltInType(td)) {
deleteTypeOrFeatureMentions(sTypeNameToRemove, TYPES, null);
@@ -990,7 +987,7 @@
if (null != featuresToRemove)
for (int i = 0; i < featuresToRemove.length; i++) {
deleteTypeOrFeatureMentions(featuresToRemove[i].featureName, FEATURES,
- featuresToRemove[i].typeName);
+ featuresToRemove[i].typeName);
}
editor.removeDirtyTypeName(sTypeNameToRemove);
@@ -1024,9 +1021,9 @@
return null;
}
sMsg += ". If you proceed, the dependent types which are updatable will be updated."
- + " Non-updatable types (imported, etc.) you will have to update manually. Please confirm.";
+ + " Non-updatable types (imported, etc.) you will have to update manually. Please confirm.";
if (MessageDialog.OK == Utility.popOkCancel("Confirm renaming type update actions", sMsg,
- MessageDialog.WARNING))
+ MessageDialog.WARNING))
return typesRequiringThisOne;
return null;
}
@@ -1035,12 +1032,12 @@
private void removeType(TypeDescription td, TypeSystemDescription tsd) {
tsd.setTypes((TypeDescription[]) Utility.removeElementFromArray(tsd.getTypes(), td,
- TypeDescription.class));
+ TypeDescription.class));
}
private void removeFeature(TypeDescription td, FeatureDescription fd) {
td.setFeatures((FeatureDescription[]) Utility.removeElementFromArray(td.getFeatures(), fd,
- FeatureDescription.class));
+ FeatureDescription.class));
}
private String[] getTypesRequiringThisOne(String typeName) {
@@ -1186,7 +1183,7 @@
}
} else if (kind == REMOVE_EQUAL_TYPE) {
Object[] newTypeNames = Utility.removeElementsFromArray(typeNames, typeName,
- String.class);
+ String.class);
if (newTypeNames != typeNames) {
priorityLists[i].setTypes((String[]) newTypeNames);
returnValue = true;
@@ -1201,12 +1198,12 @@
}
private TypeOrFeature[] deleteTypeOrFeatureFromCapability(TypeOrFeature[] io_s,
- final boolean isType, String name, String typeName) {
+ final boolean isType, String name, String typeName) {
if (!isType) // is feature
name = typeName + ':' + name;
return (TypeOrFeature[]) Utility.removeElementsFromArray(io_s, name, TypeOrFeature.class,
- isType ? capabilityTypeCompare : capabilityFeatureCompare);
+ isType ? capabilityTypeCompare : capabilityFeatureCompare);
}
private final static boolean TYPES = true;
@@ -1251,16 +1248,16 @@
* type name (used when feature name passed above
*/
private void deleteTypeOrFeatureMentions(final String typeOrFeatureName, boolean isType,
- final String typeName) {
+ final String typeName) {
if (!isLocalProcessingDescriptor()) {
return;
}
Capability[] c = getCapabilities();
for (int ic = 0; ic < c.length; ic++) {
c[ic].setInputs(deleteTypeOrFeatureFromCapability(c[ic].getInputs(), isType,
- typeOrFeatureName, typeName));
+ typeOrFeatureName, typeName));
c[ic].setOutputs(deleteTypeOrFeatureFromCapability(c[ic].getOutputs(), isType,
- typeOrFeatureName, typeName));
+ typeOrFeatureName, typeName));
}
CapabilityPage p = editor.getCapabilityPage();
@@ -1270,13 +1267,13 @@
final FsIndexCollection indexCollection = editor.getFsIndexCollection();
FsIndexDescription[] indexes = (null == indexCollection) ? null : indexCollection
- .getFsIndexes();
+ .getFsIndexes();
boolean somethingChanged = false;
if (indexes != null) {
if (isType) {
FsIndexDescription[] newFsid = (FsIndexDescription[]) Utility.removeElementsFromArray(
- indexes, typeOrFeatureName, FsIndexDescription.class, fsIndexDescCompare);
+ indexes, typeOrFeatureName, FsIndexDescription.class, fsIndexDescCompare);
if (newFsid != indexes) {
somethingChanged = true;
indexCollection.setFsIndexes(newFsid);
@@ -1285,8 +1282,8 @@
for (int i = 0; i < indexes.length; i++) {
if (typeName.equals(indexes[i].getTypeName())) {
FsIndexKeyDescription[] newFsKeys = (FsIndexKeyDescription[]) Utility
- .removeElementsFromArray(indexes[i].getKeys(), typeOrFeatureName,
- FsIndexKeyDescription.class, fsIndexKeyDescCompare);
+ .removeElementsFromArray(indexes[i].getKeys(), typeOrFeatureName,
+ FsIndexKeyDescription.class, fsIndexKeyDescCompare);
if (newFsKeys != indexes[i].getKeys()) {
somethingChanged = true;
indexes[i].setKeys(newFsKeys);
@@ -1340,13 +1337,13 @@
if (null != localTd) { // is a local type
if (isImportedType(typeName)) {
Utility
- .popMessage(
- "Imported type won't be changed",
- "There is both a local and imported version of type, '"
- + typeName
- + "', which has a supertype which is the item being renamed. Although the local version will be updated, but the imported one won't."
- + "This may cause an error when you save.",
- MessageDialog.WARNING);
+ .popMessage(
+ "Imported type won't be changed",
+ "There is both a local and imported version of type, '"
+ + typeName
+ + "', which has a supertype which is the item being renamed. Although the local version will be updated, but the imported one won't."
+ + "This may cause an error when you save.",
+ MessageDialog.WARNING);
}
if (isBuiltInType(typeName)) {
// invalid: changed some type name which was a supertype of a built in - but
@@ -1356,13 +1353,13 @@
} else { // is not a local type
// can't be a built-in type because all the supertypes of built-ins are unchangeable
Utility
- .popMessage(
- "Imported type not changed",
- "There is an imported type, '"
- + typeName
- + "', which has a supertype which is the item being renamed. It won't be updated - this may cause an error when you save this descriptor."
- + " If it does, you will need to edit the imported type to change it.",
- MessageDialog.WARNING);
+ .popMessage(
+ "Imported type not changed",
+ "There is an imported type, '"
+ + typeName
+ + "', which has a supertype which is the item being renamed. It won't be updated - this may cause an error when you save this descriptor."
+ + " If it does, you will need to edit the imported type to change it.",
+ MessageDialog.WARNING);
continue;
}
// guaranteed to have local type def here
@@ -1404,7 +1401,7 @@
// this function to set the corresponding feature in the "local" type's fd array
private void setNamedFeatureDescriptionRange(FeatureDescription[] localFds, String featureName,
- final String rangeName) {
+ final String rangeName) {
if (null != localFds) {
for (int i = 0; i < localFds.length; i++) {
FeatureDescription fd = localFds[i];
@@ -1420,24 +1417,23 @@
if (isLocalType(typeName)) {
if (isImportedType(typeName)) {
Utility
- .popMessage(
- "Imported type won't be changed",
- "There is both a local and imported version of type, '"
- + typeName
- + "', which has a feature whose range type is the item being renamed. Although the local version will be updated, but the imported one won't."
- + "This may cause an error when you save.",
- MessageDialog.WARNING);
+ .popMessage(
+ "Imported type won't be changed",
+ "There is both a local and imported version of type, '"
+ + typeName
+ + "', which has a feature whose range type is the item being renamed. Although the local version will be updated, but the imported one won't."
+ + "This may cause an error when you save.", MessageDialog.WARNING);
}
return false;
} else { // is not a local type
Utility
- .popMessage(
- "Imported feature range not changed",
- "There is an imported type, '"
- + typeName
- + "', which has a a feature whose range which is the item being renamed. It won't be updated - this may cause an error when you save this descriptor."
- + " If it does, you will need to edit the imported type to change it.",
- MessageDialog.WARNING);
+ .popMessage(
+ "Imported feature range not changed",
+ "There is an imported type, '"
+ + typeName
+ + "', which has a a feature whose range which is the item being renamed. It won't be updated - this may cause an error when you save this descriptor."
+ + " If it does, you will need to edit the imported type to change it.",
+ MessageDialog.WARNING);
return true;
}
}
@@ -1474,7 +1470,7 @@
FsIndexCollection indexCollection = getAnalysisEngineMetaData().getFsIndexCollection();
FsIndexDescription[] indexes = (null == indexCollection) ? null : indexCollection
- .getFsIndexes();
+ .getFsIndexes();
boolean somethingChanged = false;
boolean markStale = false;
@@ -1588,7 +1584,7 @@
}
private void alterFeatureMentions(final String sOldFeatureName, final String sNewFeatureName,
- final String typeName) {
+ final String typeName) {
final boolean[] somethingChanged = new boolean[1];
somethingChanged[0] = false;
if (sOldFeatureName.equals(sNewFeatureName) || (!isLocalProcessingDescriptor()))
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java?view=diff&rev=480241&r1=480240&r2=480241
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/Utility.java Tue Nov 28 14:21:27 2006
@@ -42,10 +42,9 @@
* @param defaultIndex
*/
public Utility(Shell parentShell, String dialogTitle, Image dialogTitleImage,
- String dialogMessage, int dialogImageType, String[] dialogButtonLabels,
- int defaultIndex) {
+ String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType,
- dialogButtonLabels, defaultIndex);
+ dialogButtonLabels, defaultIndex);
// TODO Auto-generated constructor stub
}
@@ -106,7 +105,7 @@
*/
public static Object[] removeElementFromArray(Object[] source, Object element,
- Class componentClass) {
+ Class componentClass) {
Object[] result = (Object[]) Array.newInstance(componentClass, source.length - 1);
for (int i = 0, j = 0; i < source.length; i++) {
if (element != source[i])
@@ -125,7 +124,7 @@
*/
public static Object[] removeEqualElementFromArray(Object[] source, Object element,
- Class componentClass) {
+ Class componentClass) {
Object[] result = (Object[]) Array.newInstance(componentClass, source.length - 1);
for (int i = 0, j = 0; i < source.length; i++) {
if (element == null && source[i] == null)
@@ -138,7 +137,7 @@
}
public static Object[] removeElementsFromArray(Object[] source, Object element,
- Class componentClass) {
+ Class componentClass) {
if (null == source)
return null;
int count = 0;
@@ -158,7 +157,7 @@
}
public static Object[] removeElementsFromArray(Object[] source, Object element,
- Class componentClass, Comparator comp) {
+ Class componentClass, Comparator comp) {
if (null == source)
return null;
int count = 0;