Author: pkluegl
Date: Wed Feb 13 11:24:19 2019
New Revision: 1853491
URL: http://svn.apache.org/viewvc?rev=1853491&view=rev
Log:
UIMA-5982 - remove useless javadoc
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/evalDataTable/TypeTableSorter.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearner.java
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearnerFactory.java
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/RankedList.java
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/ShiftAllRule.java
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/TrabalLearner.java
uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/evalDataTable/TypeTableSorter.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/evalDataTable/TypeTableSorter.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/evalDataTable/TypeTableSorter.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/evalDataTable/TypeTableSorter.java
Wed Feb 13 11:24:19 2019
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
public class TypeTableSorter extends ViewerSorter {
-
+
private static final int ASCENDING = 0;
private static final int DESCENDING = 1;
@@ -32,13 +32,6 @@ public class TypeTableSorter extends Vie
private int direction;
- /**
- * Does the sort. If it's a different column from the previous sort, do an
- * ascending sort. If it's the same column as the last sort, toggle the sort
- * direction.
- *
- * @param column
- */
public void doSort(int column) {
if (column == this.column) {
// Same column as last sort; toggle the direction
@@ -50,19 +43,13 @@ public class TypeTableSorter extends Vie
}
}
- /**
- * Compares the object for sorting
- */
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
int rc = 0;
TypeEvalData td1 = (TypeEvalData) e1;
TypeEvalData td2 = (TypeEvalData) e2;
-
-
-
- switch(column) {
+ switch (column) {
case TypeEvalTableConst.COLUMN_TYPE_NAME:
rc = td1.getTypeName().compareTo(td2.getTypeName());
break;
@@ -76,50 +63,21 @@ public class TypeTableSorter extends Vie
rc = td1.getFalseNegatives() - td2.getFalseNegatives();
break;
case TypeEvalTableConst.COLUMN_PRECISION:
- rc = Double.compare(td1.getPrecision() , td2.getPrecision());
+ rc = Double.compare(td1.getPrecision(), td2.getPrecision());
break;
case TypeEvalTableConst.COLUMN_RECALL:
- rc = Double.compare(td1.getRecall() , td2.getRecall());
+ rc = Double.compare(td1.getRecall(), td2.getRecall());
break;
case TypeEvalTableConst.COLUMN_F1:
- rc = Double.compare(td1.getFOne() , td2.getFOne());;
+ rc = Double.compare(td1.getFOne(), td2.getFOne());
+ ;
break;
}
-
+
if (direction == DESCENDING)
rc = -rc;
- return rc;
-
-
-// int rc = 0;
-// Player p1 = (Player) e1;
-// Player p2 = (Player) e2;
-//
-// // Determine which column and do the appropriate sort
-// switch (column) {
-// case PlayerConst.COLUMN_FIRST_NAME:
-// rc = collator.compare(p1.getFirstName(), p2.getFirstName());
-// break;
-// case PlayerConst.COLUMN_LAST_NAME:
-// rc = collator.compare(p1.getLastName(), p2.getLastName());
-// break;
-// case PlayerConst.COLUMN_POINTS:
-// rc = p1.getPoints() > p2.getPoints() ? 1 : -1;
-// break;
-// case PlayerConst.COLUMN_REBOUNDS:
-// rc = p1.getRebounds() > p2.getRebounds() ? 1 : -1;
-// break;
-// case PlayerConst.COLUMN_ASSISTS:
-// rc = p1.getAssists() > p2.getAssists() ? 1 : -1;
-// break;
-// }
-//
-// // If descending order, flip the direction
-// if (direction == DESCENDING)
-// rc = -rc;
-//
-// return rc;
+ return rc;
}
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java
Wed Feb 13 11:24:19 2019
@@ -106,7 +106,7 @@ import org.eclipse.ui.views.navigator.Re
*/
public class RutaCommonTab extends AbstractLaunchConfigurationTab {
- /**
+ /*
* Provides a persistable dialog for selecting the shared project location
*/
class SharedLocationSelectionDialog extends ContainerSelectionDialog {
@@ -166,15 +166,16 @@ public class RutaCommonTab extends Abstr
private Button fNotUseDltkRatio;
- /**
+ /*
* Check box list for specifying favorites
*/
private CheckboxTableViewer fFavoritesTable;
- /**
+ /*
* Modify listener that simply updates the owning launch configuration
dialog.
*/
private ModifyListener fBasicModifyListener = new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent evt) {
updateLaunchConfigurationDialog();
}
@@ -186,11 +187,12 @@ public class RutaCommonTab extends Abstr
* @see
*
org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
- PlatformUI.getWorkbench().getHelpSystem()
- .setHelp(getControl(),
IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
+ IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
comp.setLayout(new GridLayout(2, true));
comp.setFont(parent.getFont());
@@ -201,19 +203,12 @@ public class RutaCommonTab extends Abstr
createLaunchInBackgroundComponent(comp);
}
- /**
- * Creates the favorites control
- *
- * @param parent
- * the parent composite to add this one to
- *
- */
private void createFavoritesComponent(Composite parent) {
Group favComp = SWTUtil.createGroup(parent,
LaunchConfigurationsMessages.CommonTab_Display_in_favorites_menu__10, 1, 1,
GridData.FILL_BOTH);
- fFavoritesTable = CheckboxTableViewer.newCheckList(favComp, SWT.CHECK |
SWT.BORDER | SWT.MULTI
- | SWT.FULL_SELECTION);
+ fFavoritesTable = CheckboxTableViewer.newCheckList(favComp,
+ SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
Control table = fFavoritesTable.getControl();
GridData gd = new GridData(GridData.FILL_BOTH);
table.setLayoutData(gd);
@@ -221,19 +216,13 @@ public class RutaCommonTab extends Abstr
fFavoritesTable.setContentProvider(new FavoritesContentProvider());
fFavoritesTable.setLabelProvider(new FavoritesLabelProvider());
fFavoritesTable.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
updateLaunchConfigurationDialog();
}
});
}
- /**
- * Creates the shared config component
- *
- * @param parent
- * the parent composite to add this component to
- *
- */
private void createSharedConfigComponent(Composite parent) {
Group group = SWTUtil.createGroup(parent,
LaunchConfigurationsMessages.CommonTab_0, 3, 2,
GridData.FILL_HORIZONTAL);
@@ -263,17 +252,6 @@ public class RutaCommonTab extends Abstr
setSharedEnabled(false);
}
- /**
- * Creates the component set for the capture output composite
- *
- * @param data
- * .parent the parent to add this component to
- */
-
- private void test() {
-
- }
-
private void createOutputCaptureComponent(Composite parent) {
Group group = SWTUtil.createGroup(parent, "Input and Output", 1, 2,
GridData.FILL_HORIZONTAL);
@@ -354,6 +332,7 @@ public class RutaCommonTab extends Abstr
});
fVariables = createPushButton(standardGroup,
LaunchConfigurationsMessages.CommonTab_9, null);
fVariables.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
StringVariableSelectionDialog dialog = new
StringVariableSelectionDialog(getShell());
dialog.open();
@@ -363,6 +342,7 @@ public class RutaCommonTab extends Abstr
}
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
});
@@ -378,13 +358,6 @@ public class RutaCommonTab extends Abstr
});
}
- /**
- * Enables or disables the output capture widgets based on the the specified
enablement
- *
- * @param enable
- * if the output capture widgets should be enabled or not
- *
- */
private void enableOuputCaptureWidgets(boolean enable) {
fFileText.setEnabled(enable);
fFileBrowse.setEnabled(enable);
@@ -393,20 +366,14 @@ public class RutaCommonTab extends Abstr
fAppend.setEnabled(enable);
}
- /**
- * Creates the encoding component
- *
- * @param parent
- * the parent to add this composite to
- */
private void createEncodingComponent(Composite parent) {
List allEncodings = IDEEncoding.getIDEEncodings();
String defaultEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding();
Group group = SWTUtil.createGroup(parent,
LaunchConfigurationsMessages.CommonTab_1, 2, 1,
GridData.FILL_BOTH);
- fDefaultEncodingButton = createRadioButton(group, MessageFormat.format(
- LaunchConfigurationsMessages.CommonTab_2, new String[] {
defaultEncoding }));
+ fDefaultEncodingButton = createRadioButton(group, MessageFormat
+ .format(LaunchConfigurationsMessages.CommonTab_2, new String[] {
defaultEncoding }));
GridData gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false);
gd.horizontalSpan = 2;
fDefaultEncodingButton.setLayoutData(gd);
@@ -434,14 +401,9 @@ public class RutaCommonTab extends Abstr
fEncodingCombo.addSelectionListener(listener);
}
- /**
- * Creates the controls needed to edit the launch in background attribute of
an external tool
- *
- * @param parent
- * the composite to create the controls in
- */
protected void createLaunchInBackgroundComponent(Composite parent) {
- fLaunchInBackgroundButton = createCheckButton(parent,
LaunchConfigurationsMessages.CommonTab_10);
+ fLaunchInBackgroundButton = createCheckButton(parent,
+ LaunchConfigurationsMessages.CommonTab_10);
GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
data.horizontalSpan = 2;
fLaunchInBackgroundButton.setLayoutData(data);
@@ -454,20 +416,11 @@ public class RutaCommonTab extends Abstr
});
}
- /**
- * handles the shared radio button being selected
- */
private void handleSharedRadioButtonSelected() {
setSharedEnabled(isShared());
updateLaunchConfigurationDialog();
}
- /**
- * Sets the widgets for specifying that a launch configuration is to be
shared to the enable value
- *
- * @param enable
- * the enabled value for
- */
private void setSharedEnabled(boolean enable) {
fSharedLocationText.setEnabled(enable);
fSharedLocationButton.setEnabled(enable);
@@ -492,26 +445,15 @@ public class RutaCommonTab extends Abstr
return path;
}
- /**
- * if the shared radio button is selected, indicating that the launch
configuration is to be
- * shared
- *
- * @return true if the radio button is selected, false otherwise
- */
private boolean isShared() {
return fSharedRadioButton.getSelection();
}
- /**
- * Handles the shared location button being selected
- */
private void handleSharedLocationButtonSelected() {
String currentContainerString = fSharedLocationText.getText();
IContainer currentContainer = getContainer(currentContainerString);
- SharedLocationSelectionDialog dialog = new SharedLocationSelectionDialog(
- getShell(),
- currentContainer,
- false,
+ SharedLocationSelectionDialog dialog = new
SharedLocationSelectionDialog(getShell(),
+ currentContainer, false,
LaunchConfigurationsMessages.CommonTab_Select_a_location_for_the_launch_configuration_13);
dialog.showClosedProjects(false);
dialog.open();
@@ -523,13 +465,6 @@ public class RutaCommonTab extends Abstr
}
}
- /**
- * gets the container form the specified path
- *
- * @param path
- * the path to get the container from
- * @return the container for the specified path or null if one cannot be
determined
- */
private IContainer getContainer(String path) {
Path containerPath = new Path(path);
return (IContainer) getWorkspaceRoot().findMember(containerPath);
@@ -541,6 +476,7 @@ public class RutaCommonTab extends Abstr
*
@seeorg.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.
* ILaunchConfiguration)
*/
+ @Override
public void initializeFrom(ILaunchConfiguration configuration) {
boolean isShared = !configuration.isLocal();
fSharedRadioButton.setSelection(isShared);
@@ -564,12 +500,6 @@ public class RutaCommonTab extends Abstr
updateConsoleOutput(configuration);
}
- /**
- * Updates the console output form the local configuration
- *
- * @param configuration
- * the local configuration
- */
private void updateConsoleOutput(ILaunchConfiguration configuration) {
boolean outputToConsole = true;
String outputFile = null;
@@ -578,12 +508,12 @@ public class RutaCommonTab extends Abstr
boolean dltkOutput = false;
try {
- dltkOutput = configuration.getAttribute(
- ScriptLaunchConfigurationConstants.ATTR_USE_INTERACTIVE_CONSOLE,
false);
+ dltkOutput = configuration
+
.getAttribute(ScriptLaunchConfigurationConstants.ATTR_USE_INTERACTIVE_CONSOLE,
false);
outputToConsole =
configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE, true);
- outputFile = configuration
- .getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE, (String)
null);
+ outputFile =
configuration.getAttribute(IDebugUIConstants.ATTR_CAPTURE_IN_FILE,
+ (String) null);
append =
configuration.getAttribute(IDebugUIConstants.ATTR_APPEND_TO_FILE, false);
} catch (CoreException e) {
}
@@ -601,22 +531,10 @@ public class RutaCommonTab extends Abstr
enableOuputCaptureWidgets(haveOutputFile);
}
- /**
- * Updates the launch on background check button
- *
- * @param configuration
- * the local launch configuration
- */
protected void updateLaunchInBackground(ILaunchConfiguration configuration) {
fLaunchInBackgroundButton.setSelection(isLaunchInBackground(configuration));
}
- /**
- * Updates the encoding
- *
- * @param configuration
- * the local configuration
- */
private void updateEncoding(ILaunchConfiguration configuration) {
String encoding = null;
try {
@@ -636,13 +554,6 @@ public class RutaCommonTab extends Abstr
}
}
- /**
- * Returns whether the given configuration should be launched in the
background.
- *
- * @param configuration
- * the configuration
- * @return whether the configuration is configured to launch in the
background
- */
public static boolean isLaunchInBackground(ILaunchConfiguration
configuration) {
boolean launchInBackground = true;
try {
@@ -654,12 +565,6 @@ public class RutaCommonTab extends Abstr
return launchInBackground;
}
- /**
- * Updates the favorites selections from the local configuration
- *
- * @param config
- * the local configuration
- */
private void updateFavoritesFromConfig(ILaunchConfiguration config) {
fFavoritesTable.setInput(config);
fFavoritesTable.setCheckedElements(new Object[] {});
@@ -689,12 +594,6 @@ public class RutaCommonTab extends Abstr
}
}
- /**
- * Updates the configuration form the local shared config working copy
- *
- * @param config
- * the local shared config working copy
- */
private void updateConfigFromLocalShared(ILaunchConfigurationWorkingCopy
config) {
if (isShared()) {
String containerPathString = fSharedLocationText.getText();
@@ -705,20 +604,10 @@ public class RutaCommonTab extends Abstr
}
}
- /**
- * Convenience accessor
- */
protected LaunchConfigurationManager getLaunchConfigurationManager() {
return DebugUIPlugin.getDefault().getLaunchConfigurationManager();
}
- /**
- * Update the favorite settings.
- *
- * NOTE: set to <code>null</code> instead of <code>false</code> for
backwards compatibility when
- * comparing if content is equal, since 'false' is default and will be
missing for older
- * configurations.
- */
private void updateConfigFromFavorites(ILaunchConfigurationWorkingCopy
config) {
try {
Object[] checked = fFavoritesTable.getCheckedElements();
@@ -729,14 +618,14 @@ public class RutaCommonTab extends Abstr
List groups = new ArrayList();
int num = 0;
if (debug) {
- groups.add(getLaunchConfigurationManager().getLaunchGroup(
- IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
+ groups.add(getLaunchConfigurationManager()
+ .getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
num++;
}
if (run) {
num++;
- groups.add(getLaunchConfigurationManager().getLaunchGroup(
- IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
+ groups.add(getLaunchConfigurationManager()
+ .getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
}
// see if there are any changes
if (num == checked.length) {
@@ -768,9 +657,6 @@ public class RutaCommonTab extends Abstr
}
}
- /**
- * Convenience method for getting the workspace root.
- */
private IWorkspaceRoot getWorkspaceRoot() {
return ResourcesPlugin.getWorkspace().getRoot();
}
@@ -778,9 +664,8 @@ public class RutaCommonTab extends Abstr
/*
* (non-Javadoc)
*
- * @see
- *
org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration
- * )
+ * @see
org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.
+ * ILaunchConfiguration )
*/
@Override
public boolean isValid(ILaunchConfiguration config) {
@@ -790,11 +675,6 @@ public class RutaCommonTab extends Abstr
return validateLocalShared() && validateRedirectFile() &&
validateEncoding();
}
- /**
- * validates the encoding selection
- *
- * @return true if the validate encoding is allowable, false otherwise
- */
private boolean validateEncoding() {
if (fAltEncodingButton.getSelection()) {
if (fEncodingCombo.getSelectionIndex() == -1) {
@@ -806,11 +686,6 @@ public class RutaCommonTab extends Abstr
return true;
}
- /**
- * Validates if the redirect file is valid
- *
- * @return true if the filename is not zero, false otherwise
- */
private boolean validateRedirectFile() {
if (fFileOutput.getSelection()) {
int len = fFileText.getText().trim().length();
@@ -822,20 +697,17 @@ public class RutaCommonTab extends Abstr
return true;
}
- /**
- * validates the local shared config file location
- *
- * @return true if the local shared file exists, false otherwise
- */
private boolean validateLocalShared() {
if (isShared()) {
String path = fSharedLocationText.getText().trim();
IContainer container = getContainer(path);
if (container == null ||
container.equals(ResourcesPlugin.getWorkspace().getRoot())) {
-
setErrorMessage(LaunchConfigurationsMessages.CommonTab_Invalid_shared_configuration_location_14);
+ setErrorMessage(
+
LaunchConfigurationsMessages.CommonTab_Invalid_shared_configuration_location_14);
return false;
} else if (!container.getProject().isOpen()) {
-
setErrorMessage(LaunchConfigurationsMessages.CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1);
+ setErrorMessage(
+
LaunchConfigurationsMessages.CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1);
return false;
}
}
@@ -849,6 +721,7 @@ public class RutaCommonTab extends Abstr
*
@seeorg.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.
* ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) {
config.setContainer(null);
config.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, true);
@@ -860,6 +733,7 @@ public class RutaCommonTab extends Abstr
*
@seeorg.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.
* ILaunchConfigurationWorkingCopy)
*/
+ @Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
updateConfigFromLocalShared(configuration);
updateConfigFromFavorites(configuration);
@@ -901,8 +775,8 @@ public class RutaCommonTab extends Abstr
Long.toString(System.currentTimeMillis()));
IFileHandle proxyFile;
try {
- IExecutionEnvironment exeEnv = (IExecutionEnvironment)
EnvironmentManager
- .getLocalEnvironment().getAdapter(IExecutionEnvironment.class);
+ IExecutionEnvironment exeEnv = EnvironmentManager.getLocalEnvironment()
+ .getAdapter(IExecutionEnvironment.class);
proxyFile = RutaIdeUIPlugin.getDefault().getConsoleProxy(exeEnv);
configuration.setAttribute("environmentId",
proxyFile.getEnvironment().getId());
configuration.setAttribute("proxy_path", proxyFile.toOSString());
@@ -931,6 +805,7 @@ public class RutaCommonTab extends Abstr
*
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
*/
+ @Override
public String getName() {
return LaunchConfigurationsMessages.CommonTab__Common_15;
}
@@ -975,19 +850,17 @@ public class RutaCommonTab extends Abstr
public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
}
- /**
- * Content provider for the favorites table
- */
class FavoritesContentProvider implements IStructuredContentProvider {
+ @Override
public Object[] getElements(Object inputElement) {
ILaunchGroup[] groups = DebugUITools.getLaunchGroups();
List possibleGroups = new ArrayList();
ILaunchConfiguration configuration = (ILaunchConfiguration) inputElement;
for (int i = 0; i < groups.length; i++) {
ILaunchGroup extension = groups[i];
- LaunchHistory history =
getLaunchConfigurationManager().getLaunchHistory(
- extension.getIdentifier());
+ LaunchHistory history = getLaunchConfigurationManager()
+ .getLaunchHistory(extension.getIdentifier());
if (history != null && history.accepts(configuration)) {
possibleGroups.add(extension);
}
@@ -995,22 +868,21 @@ public class RutaCommonTab extends Abstr
return possibleGroups.toArray();
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
}
- /**
- * Provides the labels for the favorites table
- *
- */
class FavoritesLabelProvider implements ITableLabelProvider {
private Map fImages = new HashMap();
+ @Override
public Image getColumnImage(Object element, int columnIndex) {
Image image = (Image) fImages.get(element);
if (image == null) {
@@ -1023,14 +895,17 @@ public class RutaCommonTab extends Abstr
return image;
}
+ @Override
public String getColumnText(Object element, int columnIndex) {
String label = ((LaunchGroupExtension) element).getLabel();
return DebugUIPlugin.removeAccelerators(label);
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
Iterator images = fImages.values().iterator();
while (images.hasNext()) {
@@ -1039,10 +914,12 @@ public class RutaCommonTab extends Abstr
}
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
Wed Feb 13 11:24:19 2019
@@ -33,9 +33,6 @@ import org.eclipse.swt.widgets.Group;
public class RutaFormatterBlankLinesPage extends FormatterModifyTabPage {
- /**
- * @param dialog
- */
public RutaFormatterBlankLinesPage(IFormatterModifyDialog dialog) {
super(dialog);
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
Wed Feb 13 11:24:19 2019
@@ -41,9 +41,6 @@ import org.eclipse.swt.widgets.Text;
public class RutaFormatterIndentationTabPage extends FormatterModifyTabPage {
- /**
- * @param dialog
- */
public RutaFormatterIndentationTabPage(IFormatterModifyDialog dialog) {
super(dialog);
}
@@ -57,8 +54,8 @@ public class RutaFormatterIndentationTab
private final String[] tabPolicyItems = new String[] {
CodeFormatterConstants.SPACE,
CodeFormatterConstants.TAB, CodeFormatterConstants.MIXED };
- private class TabPolicyListener extends SelectionAdapter implements
- IFormatterControlManager.IInitializeListener {
+ private class TabPolicyListener extends SelectionAdapter
+ implements IFormatterControlManager.IInitializeListener {
private final IFormatterControlManager manager;
@@ -75,9 +72,10 @@ public class RutaFormatterIndentationTab
}
}
+ @Override
public void initialize() {
- final boolean tabMode = CodeFormatterConstants.TAB.equals(manager
- .getString(RutaFormatterConstants.FORMATTER_TAB_CHAR));
+ final boolean tabMode = CodeFormatterConstants.TAB
+
.equals(manager.getString(RutaFormatterConstants.FORMATTER_TAB_CHAR));
manager.enableControl(indentSize, !tabMode);
}
@@ -101,6 +99,7 @@ public class RutaFormatterIndentationTab
tabSize = manager.createNumber(tabPolicyGroup,
RutaFormatterConstants.FORMATTER_TAB_SIZE,
FormatterMessages.IndentationTabPage_general_group_option_tab_size);
tabSize.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
int index = tabPolicy.getSelectionIndex();
if (index >= 0) {
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
Wed Feb 13 11:24:19 2019
@@ -33,9 +33,6 @@ import org.eclipse.swt.widgets.Group;
public class RutaFormatterLineWrappingPage extends FormatterModifyTabPage {
- /**
- * @param dialog
- */
public RutaFormatterLineWrappingPage(IFormatterModifyDialog dialog) {
super(dialog);
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java
Wed Feb 13 11:24:19 2019
@@ -57,12 +57,15 @@ public class RutaFileHyperlink implement
fConsole = console;
}
+ @Override
public void linkEntered() {
}
+ @Override
public void linkExited() {
}
+ @Override
public void linkActivated() {
try {
String fileName;
@@ -104,8 +107,8 @@ public class RutaFileHyperlink implement
}
// did not find source
MessageDialog.openInformation(DLTKDebugUIPlugin.getActiveWorkbenchShell(),
- ConsoleMessages.RutaFileHyperlink_Information_1,
MessageFormat.format(
-
ConsoleMessages.RutaFileHyperlink_Source_not_found_for__0__2,
+ ConsoleMessages.RutaFileHyperlink_Information_1,
+
MessageFormat.format(ConsoleMessages.RutaFileHyperlink_Source_not_found_for__0__2,
new String[] { fileName }));
} catch (CoreException e) {
DLTKDebugUIPlugin.errorDialog(
@@ -135,6 +138,8 @@ public class RutaFileHyperlink implement
/**
* Returns the fully qualified name of the type to open
*
+ * @param linkText
+ * contains the type name
* @return fully qualified type name
* @exception CoreException
* if unable to parse the type name
@@ -151,12 +156,6 @@ public class RutaFileHyperlink implement
throw new CoreException(status);
}
- /**
- * Returns the line number associated with the stack trace or -1 if none.
- *
- * @exception CoreException
- * if unable to parse the number
- */
protected int getLineNumber(String linkText) throws CoreException {
Pattern p = Pattern.compile("line (\\d*)");
Matcher m = p.matcher(linkText);
@@ -175,21 +174,10 @@ public class RutaFileHyperlink implement
throw new CoreException(status);
}
- /**
- * Returns the console this link is contained in.
- *
- * @return console
- */
protected TextConsole getConsole() {
return fConsole;
}
- /**
- * Returns this link's text
- *
- * @exception CoreException
- * if unable to retrieve the text
- */
protected String getLinkText() throws CoreException {
try {
IDocument document = getConsole().getDocument();
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java
Wed Feb 13 11:24:19 2019
@@ -23,12 +23,6 @@ import java.io.Reader;
public interface IRutaPagesLocation {
- /**
- * Should find inside location for an information about keyword
- *
- * @param keyword
- * @return Reader with html code
- */
- public Reader getHtmlInfo(String keyword);
+ Reader getHtmlInfo(String keyword);
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java
Wed Feb 13 11:24:19 2019
@@ -42,9 +42,6 @@ public class RutaCommentReader extends S
reset();
}
- /**
- * @see java.io.Reader#read()
- */
@Override
public int read() {
if (fCurrPos < fEndPos) {
@@ -72,26 +69,17 @@ public class RutaCommentReader extends S
return -1;
}
- /**
- * @see java.io.Reader#close()
- */
@Override
public void close() {
fBuffer = null;
}
- /**
- * @see java.io.Reader#reset()
- */
@Override
public void reset() {
fCurrPos = fStartPos;
fWasNewLine = true;
}
- /**
- * Returns the offset of the last read character in the passed buffer.
- */
public int getOffset() {
return fCurrPos;
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java
Wed Feb 13 11:24:19 2019
@@ -248,12 +248,6 @@ public class RutaPagesLocationsBlock imp
}
- /**
- * Creates and returns the source lookup control.
- *
- * @param parent
- * the parent widget of this control
- */
public Control createControl(Composite parent) {
Font font = parent.getFont();
@@ -298,15 +292,6 @@ public class RutaPagesLocationsBlock imp
return comp;
}
- /**
- * Creates and returns a button
- *
- * @param parent
- * parent widget
- * @param label
- * label
- * @return Button
- */
protected Button createPushButton(Composite parent, String label) {
Button button = new Button(parent, SWT.PUSH);
button.setFont(parent.getFont());
@@ -323,9 +308,6 @@ public class RutaPagesLocationsBlock imp
button.setLayoutData(data);
}
- /**
- * Create some empty space
- */
protected void createVerticalSpacer(Composite comp, int colSpan) {
Label label = new Label(comp, SWT.NONE);
GridData gd = new GridData();
@@ -333,9 +315,6 @@ public class RutaPagesLocationsBlock imp
label.setLayoutData(gd);
}
- /**
- * Updates buttons and status based on current mans
- */
public void update() {
updateButtons();
@@ -431,9 +410,6 @@ public class RutaPagesLocationsBlock imp
public void widgetDefaultSelected(SelectionEvent e) {
}
- /**
- * Open the file selection dialog, and add the return locations.
- */
protected void add() {
DirectoryDialog dialog = new
DirectoryDialog(fLocationsViewer.getControl().getShell());
dialog.setMessage("Select directory to search into");
@@ -544,9 +520,6 @@ public class RutaPagesLocationsBlock imp
updateButtons();
}
- /**
- * Refresh the enable/disable state for the buttons.
- */
private void updateButtons() {
fClearButton.setEnabled(folders != null && folders.size() > 0);
IStructuredSelection selection = (IStructuredSelection)
fLocationsViewer.getSelection();
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java
Wed Feb 13 11:24:19 2019
@@ -66,6 +66,7 @@ public class RutaWordRule implements IPr
* the default token to be returned on success if nothing else is
specified, may not be
* <code>null</code>
* @param classNameToken
+ * - not in use
*
* @see #addWord(String, IToken)
*/
@@ -111,6 +112,7 @@ public class RutaWordRule implements IPr
private String lastFound = "";
+ @Override
public IToken evaluate(ICharacterScanner scanner) {
int c = scanner.read();
fBuffer.setLength(0);
@@ -167,10 +169,12 @@ public class RutaWordRule implements IPr
scanner.unread();
}
+ @Override
public IToken evaluate(ICharacterScanner scanner, boolean resume) {
return evaluate(scanner);
}
+ @Override
public IToken getSuccessToken() {
return this.fDefaultToken;
}
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java
Wed Feb 13 11:24:19 2019
@@ -48,8 +48,8 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-public class RutaFoldingPreferenceBlock extends AbstractConfigurationBlock
implements
- IFoldingPreferenceBlock {
+public class RutaFoldingPreferenceBlock extends AbstractConfigurationBlock
+ implements IFoldingPreferenceBlock {
protected class ListBlock {
private ListViewer fList;
@@ -90,11 +90,14 @@ public class RutaFoldingPreferenceBlock
fAddButton = createPushButton(pathButtonComp,
RutaFoldingMessages.RutaFoldingPreferenceBlock_0);
fAddButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
+ @Override
public void widgetSelected(SelectionEvent e) {
IInputValidator validator = new IInputValidator() {
+ @Override
public String isValid(String newText) {
if (newText.trim().length() > 0 &&
newText.matches("[_a-zA-Z]*")) //$NON-NLS-1$
return null;
@@ -112,9 +115,11 @@ public class RutaFoldingPreferenceBlock
fRemoveButton = createPushButton(pathButtonComp,
RutaFoldingMessages.RutaFoldingPreferenceBlock_6);
fRemoveButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
+ @Override
public void widgetSelected(SelectionEvent e) {
ISelection s = fList.getSelection();
if (s instanceof IStructuredSelection) {
@@ -140,9 +145,6 @@ public class RutaFoldingPreferenceBlock
return button;
}
- /**
- * Returns a width hint for a button control.
- */
public int getButtonWidthHint(Button button) {
button.setFont(JFaceResources.getDialogFont());
PixelConverter converter = new PixelConverter(button);
@@ -199,7 +201,8 @@ public class RutaFoldingPreferenceBlock
private OverlayKey[] fKeys;
- public RutaFoldingPreferenceBlock(OverlayPreferenceStore store,
PreferencePage mainPreferencePage) {
+ public RutaFoldingPreferenceBlock(OverlayPreferenceStore store,
+ PreferencePage mainPreferencePage) {
super(store, mainPreferencePage);
fOverlayStore = store;
fKeys = createKeys();
@@ -232,6 +235,7 @@ public class RutaFoldingPreferenceBlock
return keys;
}
+ @Override
public Control createControl(Composite composite) {
Composite inner = new Composite(composite, SWT.NONE);
GridLayout layout = new GridLayout();
@@ -258,6 +262,7 @@ public class RutaFoldingPreferenceBlock
IInputValidator val = new IInputValidator() {
+ @Override
public String isValid(String number) {
if (number.length() == 0) {
return PreferencesMessages.DLTKEditorPreferencePage_empty_input;
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
Wed Feb 13 11:24:19 2019
@@ -50,20 +50,9 @@ public class RutaCheckerUtils {
return importScript(path, type, project, false);
}
- /**
- * @param path
- * relative to script folder of the project.<br>
- * i.e.: "org.apache.uima.MyScript"
- * @param type
- * i.e. IModelElement.FIELD for fields to be collected and returned
- * @return set of elements
- * @throws InvalidXMLException
- * @throws IOException
- * @throws ModelException
- */
public static Set<String> importScript(String path, int type, IScriptProject
project,
- boolean appendPath) throws InvalidXMLException, IOException,
ModelException,
- CoreException {
+ boolean appendPath)
+ throws InvalidXMLException, IOException, ModelException,
CoreException {
// TODO rewrite method!
Stack<String> namespaceStack = new Stack<String>();
@@ -79,7 +68,7 @@ public class RutaCheckerUtils {
ISourceModule sourceModule = null;
boolean found = false;
for (IFolder eachFolder : scriptFolders) {
- if(found ) {
+ if (found) {
break;
}
IScriptProject sp = DLTKCore.create(eachFolder.getProject());
@@ -97,7 +86,7 @@ public class RutaCheckerUtils {
}
IModelElement elements[] = null;
namespaceStack.push(fileNameWithoutExtension);
- if(sourceModule == null) {
+ if (sourceModule == null) {
return imports;
}
try {
@@ -115,8 +104,8 @@ public class RutaCheckerUtils {
}
}
if (elementType == IModelElement.METHOD) {
- String nSpace = namespaceStack.empty() ?
modelElement.getElementName() : namespaceStack
- .peek() + "." + modelElement.getElementName();
+ String nSpace = namespaceStack.empty() ?
modelElement.getElementName()
+ : namespaceStack.peek() + "." +
modelElement.getElementName();
namespaceStack.push(nSpace);
imports.addAll(collectElements((IMethod) modelElement, type,
namespaceStack));
namespaceStack.pop();
@@ -166,11 +155,6 @@ public class RutaCheckerUtils {
return folder.getFile(fName);
}
- /**
- * @param xmlFilePath
- * absolute full path. i.e.: "org.apache.uima.myengine" ".xml" will
be added.
- * @return file.exists
- */
public static boolean checkEngineImport(String xmlFilePath, IScriptProject
project) {
boolean result = false;
List<IFolder> allDescriptorFolders;
@@ -221,8 +205,6 @@ public class RutaCheckerUtils {
return null;
}
-
-
public static IFile checkTypeSystemImport(String localPath, IScriptProject
project) {
List<IFolder> allDescriptorFolders;
try {
@@ -249,7 +231,7 @@ public class RutaCheckerUtils {
String prefix = "classpath*:";
String pattern = prefix + p;
Resource[] resources = resolver.getResources(pattern);
- if(resources == null || resources.length == 0) {
+ if (resources == null || resources.length == 0) {
return null;
} else {
Resource resource = resources[0];
@@ -258,6 +240,4 @@ public class RutaCheckerUtils {
}
}
-
-
}
Modified:
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearner.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearner.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearner.java
(original)
+++
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearner.java
Wed Feb 13 11:24:19 2019
@@ -48,32 +48,13 @@ public interface TextRulerLearner {
ML_UNDEFINED, ML_INITIALIZING, ML_RUNNING, ML_ERROR, ML_ABORTED, ML_DONE
};
- /**
- * There the magic has to be placed...
- */
void run();
- /**
- * this method gets called from the UI and passes a hashMap with key value
coded parameters that
- * your corresponding TextRulerLearnerFactory declared by its
getAlgorithmParameters method.
- */
void setParameters(Map<String, Object> params);
- /**
- * If any Ruta-Rules result is available (yet), the system asks your
algorithm for it by
- * calling this method.
- */
String getResultString();
- /**
- *
- * @return analysis engine
- */
AnalysisEngine getAnalysisEngine();
- /**
- *
- * @return CAS
- */
CAS getTestCAS();
}
Modified:
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearnerFactory.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearnerFactory.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearnerFactory.java
(original)
+++
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/extension/TextRulerLearnerFactory.java
Wed Feb 13 11:24:19 2019
@@ -30,39 +30,12 @@ import java.util.Set;
*/
public interface TextRulerLearnerFactory {
- /**
- * @param inputFolderPath
- * the input folder path where e.g. example XMIs are located
- * @param additionalFolderPath
- * @param preprocessorTMfile
- * the preprocessing Ruta file (this is important for finding the
type system and
- * analysis engine descriptor file)
- * @param tempFolderPath
- * a folder name that you can use as temporary folder (caution: you
need to create it if
- * you want to use it!)
- * @param fullSlotTypeNames
- * an array with the slot-names to learn (full qualified UIMA type
names)
- * @param filterSet
- * Ruta filter set (full qualified UIMA type names)
- * @param skip
- * @param delegate
- * a delegate that can be notified for status updates and asked for
aborting the
- * algorithm
- * @return the algorithm of your class that implements TextRulerLearner
- */
public TextRulerLearner createAlgorithm(String inputFolderPath, String
additionalFolderPath,
- String preprocessorTMfile, String tempFolderPath, String[]
fullSlotTypeNames,
+ String preprocessorRutaFile, String tempFolderPath, String[]
fullSlotTypeNames,
Set<String> filterSet, boolean skip, TextRulerLearnerDelegate
delegate);
- /**
- * @return null or an array with MLAlgorithmParameters your TextRulerLearner
wants to get from the
- * GUI
- */
public TextRulerLearnerParameter[] getAlgorithmParameters();
- /**
- * @return null or a key value set for the standard values of your
algorithm's parameters
- */
public Map<String, Object> getAlgorithmParameterStandardValues();
}
Modified:
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/RankedList.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/RankedList.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/RankedList.java
(original)
+++
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/RankedList.java
Wed Feb 13 11:24:19 2019
@@ -46,11 +46,7 @@ public class RankedList extends ArrayLis
addAll(c);
}
- /**
- * Adds the item to the list and increases its ranking by one.
- *
- * @return true, if the item was newly inserted into the list.
- */
+ @Override
public boolean add(Condition e) {
boolean result;
double value;
@@ -71,10 +67,6 @@ public class RankedList extends ArrayLis
return result;
}
- /**
- * Adds the item to the list and increases its ranking by the given number.
- *
- */
public void add(double index, Condition e) {
if (ranking.containsKey(e)) {
Double rank = ranking.get(e);
@@ -86,20 +78,13 @@ public class RankedList extends ArrayLis
}
}
- /**
- * Adds the items to the ranked list and increases their ranking by their
value in the given list.
- *
- */
public void addAll(RankedList list) {
for (Condition each : list) {
add(list.rankingOf(each), each);
}
}
- /**
- * Adds the items to the list and increases their ranking by one.
- *
- */
+ @Override
public boolean addAll(Collection<? extends Condition> c) {
for (Condition each : c) {
add(each);
@@ -107,10 +92,6 @@ public class RankedList extends ArrayLis
return true;
}
- /**
- * Adds the items to the list and increases their ranking by the given
number.
- *
- */
public boolean addAll(double index, Collection<? extends Condition> c) {
for (Condition each : c) {
add(index, each);
@@ -118,6 +99,7 @@ public class RankedList extends ArrayLis
return true;
}
+ @Override
public Condition remove(int index) {
Condition element = super.get(index);
if (element != null) {
@@ -130,6 +112,7 @@ public class RankedList extends ArrayLis
return null;
}
+ @Override
public boolean remove(Object o) {
if (size() > 0) {
if (contains(o) && ranking.containsKey(o)) {
@@ -141,23 +124,28 @@ public class RankedList extends ArrayLis
return false;
}
+ @Override
public List<Condition> subList(int start, int end) {
return super.subList(start, end);
}
+ @Override
public boolean contains(Object o) {
return super.contains(o);
}
+ @Override
public void clear() {
super.clear();
ranking.clear();
}
+ @Override
public int size() {
return super.size();
}
+ @Override
public RankedList clone() {
RankedList clone = new RankedList(idf);
for (Condition element : subList(0, size())) {
@@ -166,16 +154,11 @@ public class RankedList extends ArrayLis
return clone;
}
+ @Override
public Condition get(int i) {
return super.get(i);
}
- /**
- * Returns the ranking of the given object.
- *
- * @param each
- * @return ranking
- */
public double rankingOf(Condition each) {
if (contains(each)) {
return ranking.get(each).doubleValue();
@@ -187,9 +170,6 @@ public class RankedList extends ArrayLis
return ranking;
}
- /**
- * Sorts the elements of the list in order of its ranking.
- */
public void sort() {
List<Condition> newList = new ArrayList<Condition>();
for (int i = 0; i < size(); i++) {
@@ -206,12 +186,6 @@ public class RankedList extends ArrayLis
super.addAll(newList);
}
- /**
- * Unites the lists and adds their values for common elements.
- *
- * @param list
- * A list of the same type.
- */
public RankedList unite(RankedList list) {
RankedList clone = clone();
for (Condition element : list.subList(0, list.size())) {
@@ -221,13 +195,6 @@ public class RankedList extends ArrayLis
return clone;
}
- /**
- * Removes all elements that are not part of both lists. Also adds the
values of elements that
- * occur in both lists.
- *
- * @param list
- * A list of the same type.
- */
public RankedList cut(RankedList list) {
RankedList clone = clone();
for (Condition element : subList(0, size())) {
@@ -241,13 +208,6 @@ public class RankedList extends ArrayLis
return clone;
}
- /**
- * Removes all elements of the given list that occur in this list. Also adds
the values of
- * elements that occur in both lists.
- *
- * @param list
- * A list of the same type.
- */
public RankedList subtract(RankedList list) {
RankedList clone = clone();
for (Condition element : subList(0, size())) {
@@ -275,10 +235,6 @@ public class RankedList extends ArrayLis
return super.set(index, element);
}
- /**
- * Adds the element to the list and assigns the ranking of the element
located at the index. If
- * the element already exists, it is only assigned the ranking value.
- */
@Override
public void add(int index, Condition element) {
if (size() >= index) {
Modified:
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/ShiftAllRule.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/ShiftAllRule.java?rev=1853491&r1=1853490&r2=1853491&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/ShiftAllRule.java
(original)
+++
uima/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/learner/trabal/ShiftAllRule.java
Wed Feb 13 11:24:19 2019
@@ -75,8 +75,9 @@ public class ShiftAllRule extends Shifti
after = "{" + after + "}";
// this part will delete the original annotation
- String unmark = errorBoundaryItem + (frontItemInBorders ? "" : " ANY")
+"{STARTSWITH(" + annotation.getType().getShortName()
- + ") -> UNMARK(" + annotation.getType().getShortName() + ",
true)}";
+ String unmark = errorBoundaryItem + (frontItemInBorders ? "" : " ANY") +
"{STARTSWITH("
+ + annotation.getType().getShortName() + ") -> UNMARK("
+ + annotation.getType().getShortName() + ", true)}";
if (shiftToLeft)
compileShiftToLeft(frontItemInBorders, rearItemInBorders, before,
after, action, unmark);
@@ -100,8 +101,7 @@ public class ShiftAllRule extends Shifti
+ rearBoundaryItem + ")}"; // like ANY*? but faster
// ruleString += "#{-CONTAINS(" + errorBoundaryItem + ")} " + unmark + "
#{-CONTAINS("
// + rearBoundaryItem + ")}"; // like ANY*? but faster
-
-
+
// Check, if the rear item should be included and mark all tokens between
the brackets as
// the
// new annotation.
@@ -128,8 +128,6 @@ public class ShiftAllRule extends Shifti
ruleString += "ANY*{-PARTOF(" + rearBoundaryItem + ")}"; // like ANY*? but
faster
// ruleString += "#{-CONTAINS(" + rearBoundaryItem + ")}"; // like ANY*?
but faster
-
-
// Check, if the rear item should be included and mark all tokens between
the brackets as
// the
// new annotation.
@@ -194,11 +192,6 @@ public class ShiftAllRule extends Shifti
return false;
}
- /**
- * Sets the boundary item that marks the beginning of the original
annotation.
- *
- * @param errorBoundaryItem
- */
public void setErrorBoundaryItem(TrabalRuleItem errorBoundaryItem) {
this.errorBoundaryItem = errorBoundaryItem;
}
