You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2019/11/18 12:19:33 UTC
svn commit: r1869967 [9/12] - in /uima/uv3/ruta-v3/trunk: ./
example-projects/ExampleProject/descriptor/
example-projects/ExampleProject/descriptor/uima/ruta/example/
example-projects/ExtensionsExample/ example-projects/GermanNovels/
example-projects/M...
Modified: uima/uv3/ruta-v3/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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/debug/ui/launchConfiguration/RutaCommonTab.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterBlankLinesPage.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterIndentationTabPage.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/preferences/RutaFormatterLineWrappingPage.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/JavaLocalApplicationLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/JavaLocalApplicationLaunchConfigurationDelegate.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/JavaLocalApplicationLaunchConfigurationDelegate.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/JavaLocalApplicationLaunchConfigurationDelegate.java Mon Nov 18 12:19:31 2019
@@ -34,8 +34,8 @@ import org.eclipse.dltk.internal.debug.c
import org.eclipse.jdt.launching.JavaLaunchDelegate;
import org.eclipse.ui.console.IOConsole;
-public class JavaLocalApplicationLaunchConfigurationDelegate extends JavaLaunchDelegate implements
- ILaunchConfigurationDelegate {
+public class JavaLocalApplicationLaunchConfigurationDelegate extends JavaLaunchDelegate
+ implements ILaunchConfigurationDelegate {
@Override
public String getVMArguments(ILaunchConfiguration configuration) throws CoreException {
@@ -45,7 +45,6 @@ public class JavaLocalApplicationLaunchC
@Override
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
- // System.out.println("launching");
IDbgpService dbgpService = null;
try {
dbgpService = DLTKDebugPlugin.getDefault().getDbgpService();
@@ -60,6 +59,7 @@ public class JavaLocalApplicationLaunchC
final RutaSourceLookupDirector l = new RutaSourceLookupDirector();
launch.setSourceLocator(new ISourceLocator() {
+ @Override
public Object getSourceElement(IStackFrame stackFrame) {
Object sourceElement = sourceLocator.getSourceElement(stackFrame);
if (sourceElement != null)
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java Mon Nov 18 12:19:31 2019
@@ -71,26 +71,31 @@ import org.eclipse.ui.console.MessageCon
import org.eclipse.ui.console.MessageConsoleStream;
import org.xml.sax.SAXException;
-public class RutaInterpreterRunner extends AbstractInterpreterRunner implements IConfigurableRunner {
+public class RutaInterpreterRunner extends AbstractInterpreterRunner
+ implements IConfigurableRunner {
public static final IRutaInterpreterRunnerConfig DEFAULT_CONFIG = new IRutaInterpreterRunnerConfig() {
+ @Override
public void adjustRunnerConfiguration(VMRunnerConfiguration vconfig, InterpreterConfig iconfig,
ILaunch launch, IJavaProject project) {
- System.out.println("adjust runner");
}
+ @Override
public String[] computeClassPath(InterpreterConfig config, ILaunch launch, IJavaProject project)
throws Exception {
return RutaInterpreterRunner.getClassPath(project);
}
+ @Override
public String[] getProgramArguments(InterpreterConfig config, ILaunch launch,
IJavaProject project) {
return new String[0];
}
- public String getRunnerClassName(InterpreterConfig config, ILaunch launch, IJavaProject project) {
+ @Override
+ public String getRunnerClassName(InterpreterConfig config, ILaunch launch,
+ IJavaProject project) {
return "RutaRunner";
}
@@ -173,8 +178,8 @@ public class RutaInterpreterRunner exten
public static void doRunImpl(InterpreterConfig config, ILaunch launch,
IRutaInterpreterRunnerConfig iconfig, IProgressMonitor monitor) throws CoreException {
String launchMode = launch.getLaunchMode();
- IScriptProject proj = AbstractScriptLaunchConfigurationDelegate.getScriptProject(launch
- .getLaunchConfiguration());
+ IScriptProject proj = AbstractScriptLaunchConfigurationDelegate
+ .getScriptProject(launch.getLaunchConfiguration());
IPath projectPath = proj.getResource().getLocation();
IPath inputDirPath = projectPath.append(RutaProjectUtils.getDefaultInputLocation());
@@ -363,6 +368,7 @@ public class RutaInterpreterRunner exten
return RutaLaunchConfigurationConstants.ID_RUTA_PROCESS_TYPE;
}
+ @Override
public void setRunnerConfig(IRutaInterpreterRunnerConfig config) {
this.config = config;
}
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/DefaultRutaSemanticHighlightingExtension.java Mon Nov 18 12:19:31 2019
@@ -30,6 +30,7 @@ import org.eclipse.dltk.ast.declarations
import org.eclipse.dltk.ast.declarations.MethodDeclaration;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
import org.eclipse.dltk.ast.declarations.TypeDeclaration;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.compiler.env.ISourceModule;
import org.eclipse.dltk.core.SourceParserUtil;
import org.eclipse.dltk.ui.editor.highlighting.HighlightedPosition;
@@ -102,7 +103,7 @@ public class DefaultRutaSemanticHighligh
return highlightings;
}
- public void doOtherHighlighting(ISourceModule code,
+ public void doOtherHighlighting(IModuleSource code,
final ISemanticHighlightingRequestor semanticHighlightingRequestor) {
ModuleDeclaration moduleDeclaration = SourceParserUtil
.getModuleDeclaration((org.eclipse.dltk.core.ISourceModule) (code.getModelElement()));
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/console/RutaFileHyperlink.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/IRutaPagesLocation.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaCommentReader.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPageFolder.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPageFolder.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPageFolder.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPageFolder.java Mon Nov 18 12:19:31 2019
@@ -28,9 +28,11 @@ import java.util.HashMap;
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.io.IOUtils;
-import org.apache.uima.ruta.utils.XmlUtils;
+import org.apache.uima.internal.util.XMLUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -90,10 +92,11 @@ public class RutaPageFolder {
// Do the parsing and obtain the top-level node
Element config = null;
try {
- DocumentBuilder parser = XmlUtils.createDocumentBuilder();
- parser.setErrorHandler(new DefaultHandler());
- config = parser.parse(new InputSource(stream)).getDocumentElement();
- } catch (SAXException e) {
+ DocumentBuilderFactory documentBuilderFactory = XMLUtils.createDocumentBuilderFactory();
+ DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
+ builder.setErrorHandler(new DefaultHandler());
+ config = builder.parse(new InputSource(stream)).getDocumentElement();
+ } catch (SAXException | IOException | ParserConfigurationException e) {
throw new IOException("Bad XML format");
} finally {
IOUtils.closeQuietly(stream);
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/documentation/RutaPagesLocationsBlock.java Mon Nov 18 12:19:31 2019
@@ -33,21 +33,22 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.ruta.ide.ui.RutaPreferenceConstants;
-import org.apache.uima.ruta.utils.XmlUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.ui.DLTKPluginImages;
import org.eclipse.dltk.ui.dialogs.TimeTriggeredProgressMonitorDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -141,8 +142,17 @@ public class RutaPagesLocationsBlock imp
return null;
// Create the Document and the top-level node
- DocumentBuilder docBuilder = XmlUtils.createDocumentBuilder();
- Document doc = docBuilder.newDocument();
+ DocumentBuilderFactory documentBuilderFactory = XMLUtils.createDocumentBuilderFactory();
+ DocumentBuilder builder;
+ try {
+ builder = documentBuilderFactory.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ if (DLTKCore.DEBUG) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+ Document doc = builder.newDocument();
Element topElement = doc.createElement("manPages");
doc.appendChild(topElement);
@@ -165,9 +175,7 @@ public class RutaPagesLocationsBlock imp
ByteArrayOutputStream s = new ByteArrayOutputStream();
try {
- TransformerFactory factory = TransformerFactory.newInstance();
- factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
- factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ TransformerFactory factory = XMLUtils.createTransformerFactory();
Transformer transformer = factory.newTransformer();
transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
@@ -175,17 +183,19 @@ public class RutaPagesLocationsBlock imp
DOMSource source = new DOMSource(doc);
StreamResult outputTarget = new StreamResult(s);
transformer.transform(source, outputTarget);
- } catch (TransformerConfigurationException e) {
- e.printStackTrace();
} catch (TransformerException e) {
- e.printStackTrace();
+ if (DLTKCore.DEBUG) {
+ e.printStackTrace();
+ }
}
String result = null;
try {
result = s.toString("UTF8");
} catch (UnsupportedEncodingException e) {
- e.printStackTrace();
+ if (DLTKCore.DEBUG) {
+ e.printStackTrace();
+ }
}
return result;
@@ -193,6 +203,7 @@ public class RutaPagesLocationsBlock imp
private class ManLocationsContentProvider implements ITreeContentProvider {
+ @Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof RutaPageFolder) {
RutaPageFolder folder = (RutaPageFolder) parentElement;
@@ -208,36 +219,35 @@ public class RutaPagesLocationsBlock imp
return new Object[0];
}
+ @Override
public Object getParent(Object element) {
return null;
}
+ @Override
public boolean hasChildren(Object element) {
if (element instanceof RutaPageFolder)
return true;
return false;
}
+ @Override
public Object[] getElements(Object inputElement) {
if (folders == null)
return new Object[0];
return folders.toArray(new Object[folders.size()]);
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
}
- /**
- * Creates and returns the source lookup control.
- *
- * @param parent
- * the parent widget of this control
- */
public Control createControl(Composite parent) {
Font font = parent.getFont();
@@ -282,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());
@@ -307,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();
@@ -317,9 +315,6 @@ public class RutaPagesLocationsBlock imp
label.setLayoutData(gd);
}
- /**
- * Updates buttons and status based on current mans
- */
public void update() {
updateButtons();
@@ -379,6 +374,7 @@ public class RutaPagesLocationsBlock imp
* @see
* org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
*/
+ @Override
public void widgetSelected(SelectionEvent e) {
Object source = e.getSource();
if (source == fClearButton) {
@@ -410,12 +406,10 @@ public class RutaPagesLocationsBlock imp
* @seeorg.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.
* SelectionEvent)
*/
+ @Override
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");
@@ -428,6 +422,7 @@ public class RutaPagesLocationsBlock imp
ProgressMonitorDialog dialog2 = new TimeTriggeredProgressMonitorDialog(null, 500);
try {
dialog2.run(true, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) {
monitor.beginTask("Searching for man pages", 1);
performSearch(file);
@@ -456,6 +451,7 @@ public class RutaPagesLocationsBlock imp
File[] childs = dir.listFiles(new FileFilter() {
+ @Override
public boolean accept(File file) {
if (file.isDirectory())
return true;
@@ -519,13 +515,11 @@ public class RutaPagesLocationsBlock imp
* org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers
* .SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/ReferenceFinder.java Mon Nov 18 12:19:31 2019
@@ -22,6 +22,8 @@ package org.apache.uima.ruta.ide.ui.edit
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.uima.ruta.UIMAConstants;
import org.apache.uima.ruta.ide.parser.ast.ActionFactory;
import org.apache.uima.ruta.ide.parser.ast.ComponentDeclaration;
import org.apache.uima.ruta.ide.parser.ast.ComponentReference;
@@ -50,7 +52,7 @@ public class ReferenceFinder extends AST
if (ActionFactory.IMPLICIT.equals(a.getName()) && !a.getChilds().isEmpty()) {
ASTNode expression = a.getChilds().get(0);
if (expression != null && !expression.getChilds().isEmpty()) {
- return (ASTNode) expression.getChilds().get(0);
+ return expression.getChilds().get(0);
}
}
}
@@ -59,7 +61,7 @@ public class ReferenceFinder extends AST
if (ConditionFactory.IMPLICIT.equals(c.getName()) && !c.getChilds().isEmpty()) {
ASTNode expression = c.getChilds().get(0);
if (expression != null && !expression.getChilds().isEmpty()) {
- return (ASTNode) expression.getChilds().get(0);
+ return expression.getChilds().get(0);
}
}
}
@@ -71,7 +73,7 @@ public class ReferenceFinder extends AST
if (s instanceof RutaVariableReference && node instanceof RutaVariableReference) {
RutaVariableReference vr0 = (RutaVariableReference) node;
RutaVariableReference vr1 = (RutaVariableReference) s;
- if (vr1.getStringRepresentation().equals(vr0.getStringRepresentation())
+ if (compare(vr1.getStringRepresentation(), vr0.getStringRepresentation())
&& vr1.getType() == vr0.getType()) {
result.add(s);
}
@@ -80,19 +82,19 @@ public class ReferenceFinder extends AST
} else if (s instanceof ComponentReference && node instanceof ComponentReference) {
ComponentReference cr1 = (ComponentReference) node;
ComponentReference cr2 = (ComponentReference) s;
- if (cr1.getName().equals(cr2.getName())) {
+ if (compare(cr1.getName(), cr2.getName())) {
result.add(s);
}
} else if (s instanceof RutaAction && node instanceof RutaAction) {
RutaAction a1 = (RutaAction) node;
RutaAction a2 = (RutaAction) s;
- if (a1.getName().equals(a2.getName())) {
+ if (compare(a1.getName(), a2.getName())) {
result.add(s);
}
} else if (s instanceof RutaCondition && node instanceof RutaCondition) {
RutaCondition c1 = (RutaCondition) node;
RutaCondition c2 = (RutaCondition) s;
- if (c1.getName().equals(c2.getName())) {
+ if (compare(c1.getName(), c2.getName())) {
result.add(s);
}
@@ -100,6 +102,23 @@ public class ReferenceFinder extends AST
return super.visit(s);
}
+ private boolean compare(String mention1, String mention2) {
+
+ return StringUtils.equals(reduce(mention1), reduce(mention2));
+ }
+
+ private String reduce(String mention) {
+ if (mention.indexOf('.') > 0) {
+ if (mention.endsWith("." + UIMAConstants.FEATURE_TYPE)
+ || mention.endsWith("." + UIMAConstants.FEATURE_COVERED_TEXT)
+ || mention.endsWith("." + UIMAConstants.FEATURE_COVERED_TEXT_SHORT)) {
+ int lastIndexOf = mention.lastIndexOf('.');
+ mention = mention.substring(0, lastIndexOf);
+ }
+ }
+ return mention;
+ }
+
public List<ASTNode> getResult() {
return result;
}
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/editor/RutaEditor.java Mon Nov 18 12:19:31 2019
@@ -40,7 +40,7 @@ import org.apache.uima.ruta.ide.ui.text.
import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.core.IModelElement;
import org.eclipse.dltk.core.ISourceRange;
@@ -389,7 +389,7 @@ public class RutaEditor extends ScriptEd
}
RutaSelectionParser parser = new RutaSelectionParser();
- ISourceModule unit = (ISourceModule) getInputModelElement();
+ IModuleSource unit = (IModuleSource) getInputModelElement();
ModuleDeclaration parsed = parser.parse(unit);
RutaRuleIdVisitor visitor = new RutaRuleIdVisitor(id);
try {
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/ExternalTypeHyperlinkDetector.java Mon Nov 18 12:19:31 2019
@@ -46,7 +46,7 @@ import org.eclipse.core.resources.IFolde
import org.eclipse.core.runtime.Assert;
import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
-import org.eclipse.dltk.compiler.env.ISourceModule;
+import org.eclipse.dltk.compiler.env.IModuleSource;
import org.eclipse.dltk.core.IModelElement;
import org.eclipse.dltk.internal.ui.editor.EditorUtility;
import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
@@ -83,12 +83,11 @@ public class ExternalTypeHyperlinkDetect
IRegion wordRegion = ScriptWordFinder.findWord(document, offset);
if (wordRegion == null)
return null;
- if (input instanceof ISourceModule) {
- ISourceModule sm = (ISourceModule) input;
+ if (input instanceof IModuleSource) {
+ IModuleSource sm = (IModuleSource) input;
IModelElement modelElement = sm.getModelElement();
RutaSelectionParser parser = new RutaSelectionParser();
ModuleDeclaration moduleDeclaration = parser.parse(sm);
- String word = document.get(wordRegion.getOffset(), wordRegion.getLength());
RutaReferenceVisitor referenceVisitor = new RutaReferenceVisitor(wordRegion.getOffset());
moduleDeclaration.traverse(referenceVisitor);
ASTNode node = referenceVisitor.getResult();
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaAutoEditStrategy.java Mon Nov 18 12:19:31 2019
@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.apache.uima.ruta.ide.ui.RutaPartitions;
-import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.ui.CodeFormatterConstants;
import org.eclipse.dltk.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -849,9 +848,8 @@ public class RutaAutoEditStrategy extend
/*
* (non-Javadoc)
*
- * @see
- * org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument
- * , org.eclipse.jface.text.DocumentCommand)
+ * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.
+ * IDocument , org.eclipse.jface.text.DocumentCommand)
*/
@Override
public void customizeDocumentCommand(IDocument d, DocumentCommand c) {
@@ -867,9 +865,6 @@ public class RutaAutoEditStrategy extend
if (indent == null)
super.customizeDocumentCommand(d, c);
else {
- if (DLTKCore.DEBUG) {
- System.err.println("Bug:PTN-9");
- }
c.text = c.text + indent;
}
} catch (BadLocationException e) {
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaCorrectionProcessor.java Mon Nov 18 12:19:31 2019
@@ -37,6 +37,7 @@ import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.DLTKLanguageManager;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.core.IModelElement;
+import org.eclipse.dltk.core.IModelMarker;
import org.eclipse.dltk.core.IScriptModelMarker;
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.internal.ui.editor.ScriptEditor;
@@ -120,7 +121,7 @@ public class RutaCorrectionProcessor imp
}
public static boolean isFixable(IMarker marker) {
- if (marker.getAttribute(IScriptModelMarker.ID, 0) == RutaProblems.UNKNOWN_REQUIRED_PACKAGE) {
+ if (marker.getAttribute(IModelMarker.ID, 0) == RutaProblems.UNKNOWN_REQUIRED_PACKAGE) {
final String[] args = CorrectionEngine.getProblemArguments(marker);
if (args != null && args.length != 0 && args[0] != null) {
IResource resource = marker.getResource();
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/RutaWordRule.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/folding/RutaFoldingPreferenceBlock.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/wizards/RutaProjectCreationWizard.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/wizards/RutaProjectCreationWizard.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/wizards/RutaProjectCreationWizard.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/wizards/RutaProjectCreationWizard.java Mon Nov 18 12:19:31 2019
@@ -232,7 +232,7 @@ public class RutaProjectCreationWizard e
try {
out = new FileOutputStream(new File(dir, fileName));
} catch (FileNotFoundException e) {
- System.err.println(e);
+ DLTKCore.error(e);
}
if (in != null && out != null) {
copy(in, out);
@@ -246,20 +246,20 @@ public class RutaProjectCreationWizard e
for (int len; (len = fis.read(buffer)) != -1;)
fos.write(buffer, 0, len);
} catch (IOException e) {
- System.err.println(e);
+ DLTKCore.error(e);
} finally {
if (fis != null) {
try {
fis.close();
} catch (IOException e) {
- System.err.println(e);
+ DLTKCore.error(e);
}
}
if (fos != null) {
try {
fos.close();
} catch (IOException e) {
- System.err.println(e);
+ DLTKCore.error(e);
}
}
}
@@ -275,6 +275,7 @@ public class RutaProjectCreationWizard e
return res;
}
+ @Override
public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
fConfigElement = cfig;
}
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java Mon Nov 18 12:19:31 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/uv3/ruta-v3/trunk/ruta-ep-ide/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide/pom.xml Mon Nov 18 12:19:31 2019
@@ -138,6 +138,7 @@
<excludes>
<exclude>release.properties</exclude> <!-- release generated artifact -->
<exclude>marker-file-identifying-*</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
<exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens</exclude> <!-- grammar tokens -->
<exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens</exclude> <!-- grammar tokens -->
<exclude>issuesFixed/**</exclude>
@@ -194,7 +195,7 @@
<instructions>
<Bundle-SymbolicName>org.apache.uima.ruta.ide;singleton:=true</Bundle-SymbolicName>
<Bundle-Activator>org.apache.uima.ruta.ide.RutaIdeCorePlugin</Bundle-Activator>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<_nouses>true</_nouses>
<Export-Package>
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Mon Nov 18 12:19:31 2019
@@ -740,12 +740,11 @@ options {
as = rawActions s = SEMI
{stmt = scriptFactory.createImplicitRule(as, s);}
|
+ {stmt = scriptFactory.createRule(null, null, true);}
elements=ruleElementsRoot
- {stmt = scriptFactory.createRule(elements, null, false);}
+ {stmt.setExpressions(elements);}
s = SEMI
- {stmt = scriptFactory.createRule(elements, s);}
-
-
+ {stmt.setEnd(((CommonToken)s).getStopIndex()+1);}
;
regexpRule returns [RutaRule stmt = null]
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java Mon Nov 18 12:19:31 2019
@@ -46,6 +46,7 @@ import org.eclipse.core.resources.IConta
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -54,6 +55,7 @@ import org.eclipse.core.runtime.NullProg
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IScriptProject;
@@ -72,6 +74,7 @@ import org.eclipse.jface.preference.IPre
public class RutaBuilder extends AbstractBuildParticipantType implements IBuildParticipant,
IBuildParticipantExtension, IBuildParticipantExtension2, IBuildParticipantExtension3 {
+ @SuppressWarnings("unused")
private IScriptProject project;
public RutaBuilder() {
@@ -90,7 +93,8 @@ public class RutaBuilder extends Abstrac
IContainer container = getContainer(sourceModule);
IPath outputPath = getAbsolutePath(sourceModule);
- IPath[] generateResources = generateResources(moduleDeclaration, outputPath, container,
+ @SuppressWarnings("unused")
+ final IPath[] generateResources = generateResources(moduleDeclaration, outputPath, container,
sourceModule);
IProject proj = sourceModule.getScriptProject().getProject();
@@ -98,30 +102,57 @@ public class RutaBuilder extends Abstrac
for (IFolder iFolder : allDescriptorFolders) {
RutaProjectUtils.addProjectDataPath(proj, iFolder);
}
-
+
monitor.worked(2);
+ // refreshing deactivated in context of UIMA-5669
String defaultDescriptorLocation = RutaProjectUtils.getDefaultDescriptorLocation();
- IFolder folder = container.getProject().getFolder(defaultDescriptorLocation);
- for (IPath iPath : generateResources) {
- iPath = iPath.makeRelativeTo(folder.getLocation());
- IResource findMember = folder.findMember(iPath);
- if (findMember != null) {
- findMember.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- findMember.getParent().refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
+ final IFolder folder = container.getProject().getFolder(defaultDescriptorLocation);
+
+// for (IPath iPath : generateResources) {
+// IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+// IFile[] files = root.findFilesForLocationURI(iPath.toFile().toURI());
+// for (IFile file : files) {
+// file.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
+// }
+//
+// IResource findMember2 = root.findMember(iPath);
+//
+// iPath = iPath.makeRelativeTo(folder.getLocation());
+// IResource findMember = folder.findMember(iPath);
+// if (findMember != null) {
+// findMember.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+// findMember.getParent().refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
+// }
+//
+// }
+
+ Job refreshJob = new Job("Refreshing generated descriptors") {
+ @Override
+ public boolean belongsTo(Object family) {
+ return family == ResourcesPlugin.FAMILY_MANUAL_REFRESH;
}
- }
- folder.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(monitor,
- generateResources.length));
+ @Override
+ protected IStatus run(IProgressMonitor pm) {
+ try {
+ folder.refreshLocal(IResource.DEPTH_INFINITE,
+ new SubProgressMonitor(monitor, generateResources.length));
+ } catch (CoreException e) {
+ return e.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+ };
+ refreshJob.schedule();
- monitor.worked(1);
+ // monitor.worked(1);
} catch (ModelException e) {
if (DLTKCore.DEBUG_PARSER) {
- e.printStackTrace();
+ RutaIdeCorePlugin.error(e);
}
} catch (CoreException e) {
if (DLTKCore.DEBUG_PARSER) {
- e.printStackTrace();
+ RutaIdeCorePlugin.error(e);
}
}
monitor.done();
@@ -137,32 +168,35 @@ public class RutaBuilder extends Abstrac
String elementName = RutaProjectUtils.getModuleName(pathToModule);
IScriptProject scriptProject = sourceModule.getScriptProject();
-
+
IProject project = scriptProject.getProject();
-
+
IPath descPath = RutaProjectUtils.getDescriptorRootPath(project);
String basicTS = descPath.append("BasicTypeSystem.xml").toPortableString();
String basicE = descPath.append("BasicEngine.xml").toPortableString();
-
+
List<IFolder> descriptorFolders = RutaProjectUtils.getDescriptorFolders(project);
for (IFolder iFolder : descriptorFolders) {
File btsd = iFolder.getLocation().append("BasicTypeSystem.xml").toFile();
File baed = iFolder.getLocation().append("BasicEngine.xml").toFile();
- if(btsd.exists() && baed.exists()) {
+ if (btsd.exists() && baed.exists()) {
basicTS = btsd.getAbsolutePath();
basicE = baed.getAbsolutePath();
descPath = iFolder.getLocation();
break;
}
}
-
- IPath relativePackagePath = RutaProjectUtils.getPackagePath(sourceModule.getResource()
- .getLocation(), project);
+
+ IPath relativePackagePath = RutaProjectUtils
+ .getPackagePath(sourceModule.getResource().getLocation(), project);
IPath descPackagePath = descPath.append(relativePackagePath);
- String typeSystem = descPackagePath.append(elementName + RutaProjectUtils.getTypeSystemSuffix(project) + ".xml").toPortableString();
- String engine = descPackagePath.append(elementName + RutaProjectUtils.getAnalysisEngineSuffix(project) + ".xml").toPortableString();
+ String typeSystem = descPackagePath
+ .append(elementName + RutaProjectUtils.getTypeSystemSuffix(project) + ".xml")
+ .toPortableString();
+ String engine = descPackagePath
+ .append(elementName + RutaProjectUtils.getAnalysisEngineSuffix(project) + ".xml")
+ .toPortableString();
-
String scriptWithPackagePath = RutaProjectUtils.getScriptWithPackage(pathToModule, project);
List<String> scriptPathList = new ArrayList<String>();
List<String> descriptorPathList = new ArrayList<String>();
@@ -182,7 +216,7 @@ public class RutaBuilder extends Abstrac
} catch (Exception e) {
RutaIdeCorePlugin.error(e);
}
-
+
try {
List<IFolder> allResourceFolders = RutaProjectUtils.getAllResourceFolders(project);
resourcePathList.addAll(RutaProjectUtils.getFolderLocations(allResourceFolders));
@@ -192,8 +226,8 @@ public class RutaBuilder extends Abstrac
String[] descriptorPaths = descriptorPathList.toArray(new String[0]);
String[] scriptPaths = scriptPathList.toArray(new String[0]);
- String[] resourcePaths = resourcePathList.toArray(new String[0]);
-
+ String[] resourcePaths = resourcePathList.toArray(new String[0]);
+
String mainScript = scriptWithPackagePath;
mainScript = mainScript.replaceAll("/", ".");
if (mainScript.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
@@ -206,13 +240,14 @@ public class RutaBuilder extends Abstrac
try {
urls[counter] = new File(dep).toURI().toURL();
} catch (MalformedURLException e) {
- throw new CoreException(new Status(IStatus.ERROR,
- RutaIdeCorePlugin.PLUGIN_ID, e.getMessage()));
+ throw new CoreException(
+ new Status(IStatus.ERROR, RutaIdeCorePlugin.PLUGIN_ID, e.getMessage()));
}
counter++;
}
ClassLoader classloader = new URLClassLoader(urls);
- build(basicTS, basicE, typeSystem, engine, sm, scriptPaths, descriptorPaths, resourcePaths, classloader);
+ build(basicTS, basicE, typeSystem, engine, sm, scriptPaths, descriptorPaths, resourcePaths,
+ classloader);
IPath tsPath = Path.fromPortableString(typeSystem);
IPath ePath = Path.fromPortableString(engine);
@@ -228,7 +263,7 @@ public class RutaBuilder extends Abstrac
RutaDescriptorBuilder builder = null;
try {
URL tsUrl = new File(basicTypesystem).toURI().toURL();
- URL aeUrl= new File(basicEngine).toURI().toURL();
+ URL aeUrl = new File(basicEngine).toURI().toURL();
builder = new RutaDescriptorBuilder(tsUrl, aeUrl);
} catch (Exception e) {
DLTKCore.error(e.getMessage(), e);
@@ -283,7 +318,8 @@ public class RutaBuilder extends Abstrac
option.setImportByName(store.getBoolean(RutaCorePreferences.BUILDER_IMPORT_BY_NAME));
option.setResolveImports(store.getBoolean(RutaCorePreferences.BUILDER_RESOLVE_IMPORTS));
option.setClassLoader(classloader);
- builder.build(sm, typeSystemDest, engineDest, option, scriptPaths, enginePaths, resourcePaths);
+ builder.build(sm, typeSystemDest, engineDest, option, scriptPaths, enginePaths,
+ resourcePaths);
} catch (Exception e) {
DLTKCore.error(e.getMessage(), e);
if (DLTKCore.DEBUG_PARSER) {
@@ -330,24 +366,30 @@ public class RutaBuilder extends Abstrac
return relativeFilePath;
}
+ @Override
public void clean() {
}
+ @Override
public void prepare(IBuildChange buildChange, IBuildState buildState) throws CoreException {
}
+ @Override
public void buildExternalModule(IBuildContext context) throws CoreException {
}
+ @Override
public boolean beginBuild(int buildType) {
return buildType != RECONCILE_BUILD;
}
+ @Override
public void endBuild(IProgressMonitor monitor) {
}
+ @Override
public void build(IBuildContext context) throws CoreException {
final ModuleDeclaration ast = (ModuleDeclaration) context
.get(IBuildContext.ATTR_MODULE_DECLARATION);
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaASTUtil.java Mon Nov 18 12:19:31 2019
@@ -75,8 +75,8 @@ public class RutaASTUtil {
// return null;
}
- /**
- * We need to extend all statements to end of lines or to begining of next statement. This is
+ /*
+ * We need to extend all statements to end of lines or to beginning of next statement. This is
* needed to for correct completion in statements. Such as variable completion and so on.
*/
public static void extendStatements(ASTNode node, String content) {